From a7b3949ccda17f517bff5030da8a05eb924dc512569df3ca64c8b4e172d9f1af Mon Sep 17 00:00:00 2001 From: Jan Blunck Date: Sun, 5 Oct 2014 11:44:20 +0000 Subject: [PATCH 1/3] Accepting request 253975 from home:aspiers:branches:openSUSE:Tools - Update to version 0.4.2.1412467141.df3329e. Many changes, including: + Retrieve tags for a cached git repo + Add PEP8 checking everywhere + Significantly improved tests + Fixed checkout of a hg url that ends with a trailing slash + Fix Debian build dependencies for python + Change Debian package format to 3.0 (native) + Install into /usr on Debian + Honor submodules=disable as before (fixes #38) + Fix directory name of repository clone + Fix handling of symbolic links + Fix crash when changesrevision is missing + Improved usage text + Store git and hg hashes in full + Fix crash during copy of _servicedata + Fix format of new changes to match old shell tar_scm + Fix bug when temp file is on a different filesystem + Fix change generation bug introduced by Python rewrite + Fix retrieval of email address from ~/.oscrc + Refactor changesgenerate code OBS-URL: https://build.opensuse.org/request/show/253975 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=78 --- _service | 2 +- _servicedata | 2 +- ...ce-tar_scm-0.4.0.1410288598.7f38281.tar.gz | 3 --- ...ce-tar_scm-0.4.2.1412467141.df3329e.tar.gz | 3 +++ obs-service-tar_scm.changes | 25 +++++++++++++++++++ obs-service-tar_scm.spec | 8 ++++-- 6 files changed, 36 insertions(+), 7 deletions(-) delete mode 100644 obs-service-tar_scm-0.4.0.1410288598.7f38281.tar.gz create mode 100644 obs-service-tar_scm-0.4.2.1412467141.df3329e.tar.gz diff --git a/_service b/_service index f08ae9a..352d7fd 100644 --- a/_service +++ b/_service @@ -4,7 +4,7 @@ git .git git-master - 0.4.0.%ct.%h + 0.4.2.%ct.%h master enable diff --git a/_servicedata b/_servicedata index 4253b6f..15fe6ed 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ git://github.com/openSUSE/obs-service-tar_scm.git - 7f382817c6 + df3329e67fec7cfe40e59a17329079357bad94a0 \ No newline at end of file diff --git a/obs-service-tar_scm-0.4.0.1410288598.7f38281.tar.gz b/obs-service-tar_scm-0.4.0.1410288598.7f38281.tar.gz deleted file mode 100644 index 830da14..0000000 --- a/obs-service-tar_scm-0.4.0.1410288598.7f38281.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:707b972d7e7218b18248284d53b922327aee5b4cc6b9d8108cb33e60d2471a4e -size 24963 diff --git a/obs-service-tar_scm-0.4.2.1412467141.df3329e.tar.gz b/obs-service-tar_scm-0.4.2.1412467141.df3329e.tar.gz new file mode 100644 index 0000000..71a1bcd --- /dev/null +++ b/obs-service-tar_scm-0.4.2.1412467141.df3329e.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:35dce61cb7b355084191ca6eb30b6bc87cc445213cf44949781c8ae417fc2198 +size 27845 diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index 749c0bf..c9e31fa 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Sun Oct 05 00:02:16 UTC 2014 - aspiers@suse.com + +- Update to version 0.4.2.1412467141.df3329e. Many changes, + including: + + Retrieve tags for a cached git repo + + Add PEP8 checking everywhere + + Significantly improved tests + + Fixed checkout of a hg url that ends with a trailing slash + + Fix Debian build dependencies for python + + Change Debian package format to 3.0 (native) + + Install into /usr on Debian + + Honor submodules=disable as before (fixes #38) + + Fix directory name of repository clone + + Fix handling of symbolic links + + Fix crash when changesrevision is missing + + Improved usage text + + Store git and hg hashes in full + + Fix crash during copy of _servicedata + + Fix format of new changes to match old shell tar_scm + + Fix bug when temp file is on a different filesystem + + Fix change generation bug introduced by Python rewrite + + Fix retrieval of email address from ~/.oscrc + + Refactor changesgenerate code + ------------------------------------------------------------------- Tue Sep 9 19:01:29 UTC 2014 - jblunck@infradead.org diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index 0c73f02..502714b 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -19,7 +19,7 @@ %define service tar_scm Name: obs-service-%{service} -Version: 0.4.0.1410288598.7f38281 +Version: 0.4.2.1412467141.df3329e Release: 0 Summary: An OBS source service: checkout or update a tar ball from svn/git/hg License: GPL-2.0+ @@ -30,6 +30,7 @@ BuildRequires: bzr BuildRequires: git BuildRequires: mercurial BuildRequires: python >= 2.6 +BuildRequires: python-lxml BuildRequires: subversion Requires: bzr Requires: git @@ -53,7 +54,10 @@ make install DESTDIR="%{buildroot}" PREFIX="%{_prefix}" SYSCFG="%{_sysconfdir}" %if 0%{?suse_version} >= 1220 %check -make check +# No need to run PEP8 tests here; that would require a potentially +# brittle BuildRequires: python-pep8, and any style issues are already +# caught by Travis CI. +make test %endif %files From fd9750d9200f92a885d064143787b08f77835d6e90247ef1111b6ec3a68f8003 Mon Sep 17 00:00:00 2001 From: Jan Blunck Date: Sun, 5 Oct 2014 11:45:38 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=79 --- debian.dsc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian.dsc b/debian.dsc index 48ff07a..f9f347b 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-tar-scm -Version: 0.4.0 +Version: 0.4.2 Binary: obs-service-tar-scm Maintainer: Adrian Schroeter Architecture: all @@ -12,4 +12,5 @@ Build-Depends: debhelper (>= 7), python (>= 2.6), python-argparse | python (>= 2.7), subversion, - python-unittest2 + python-unittest2, + pep8 From a179ff0521f25fbf12367713a11c3aea0733f2f87693d9ae657fea917f9a1474 Mon Sep 17 00:00:00 2001 From: Jan Blunck Date: Sun, 5 Oct 2014 12:59:16 +0000 Subject: [PATCH 3/3] Accepting request 254007 from home:aspiers:branches:openSUSE:Tools lxml is required to pass tests on older Pythons There still seems to be one remaining submodule issue, but this is a step in the right direction. OBS-URL: https://build.opensuse.org/request/show/254007 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=80 --- debian.dsc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian.dsc b/debian.dsc index f9f347b..08a466f 100644 --- a/debian.dsc +++ b/debian.dsc @@ -13,4 +13,5 @@ Build-Depends: debhelper (>= 7), python-argparse | python (>= 2.7), subversion, python-unittest2, - pep8 + pep8, + python-lxml