diff -Nru python-etcd3gw-0.2.1/debian/changelog python-etcd3gw-0.2.1/debian/changelog --- python-etcd3gw-0.2.1/debian/changelog 2019-07-11 05:40:52.000000000 +0000 +++ python-etcd3gw-0.2.1/debian/changelog 2019-09-02 10:32:47.000000000 +0000 @@ -1,11 +1,23 @@ -python-etcd3gw (0.2.1-1ubuntu1) eoan; urgency=medium +python-etcd3gw (0.2.1-3) unstable; urgency=medium - * Drop Python 2 support: - - d/control: Drop python-etcd3gw binary package. - - d/control: Drop BDI's on python-*. - - d/rules: Skip install and test of Python 2 module. + * Add patch from Chris Lamb to make the build + reproducible (Closes: #934918). - -- James Page Thu, 11 Jul 2019 06:40:52 +0100 + -- Thomas Goirand Mon, 02 Sep 2019 12:32:47 +0200 + +python-etcd3gw (0.2.1-2) unstable; urgency=medium + + [ Ondřej Nový ] + * d/copyright: Use https in Format + * Removing gbp.conf, not used anymore or should be specified in the + developers dotfiles + * d/control: Use team+openstack@tracker.debian.org as maintainer + * Use debhelper-compat instead of debian/compat. + + [ Thomas Goirand ] + * Removed Python 2 support (Closes: #934441). + + -- Thomas Goirand Tue, 13 Aug 2019 17:57:27 +0200 python-etcd3gw (0.2.1-1) unstable; urgency=medium diff -Nru python-etcd3gw-0.2.1/debian/compat python-etcd3gw-0.2.1/debian/compat --- python-etcd3gw-0.2.1/debian/compat 2019-07-11 05:40:52.000000000 +0000 +++ python-etcd3gw-0.2.1/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -10 diff -Nru python-etcd3gw-0.2.1/debian/control python-etcd3gw-0.2.1/debian/control --- python-etcd3gw-0.2.1/debian/control 2019-07-11 05:40:52.000000000 +0000 +++ python-etcd3gw-0.2.1/debian/control 2019-09-02 10:32:47.000000000 +0000 @@ -1,22 +1,21 @@ Source: python-etcd3gw Section: python Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: PKG OpenStack +Maintainer: Debian OpenStack Uploaders: Thomas Goirand , Build-Depends: - debhelper (>= 10), + debhelper-compat (= 10), dh-python, - openstack-pkg-tools, - python-all, - python-pbr (>= 2.0.0), - python-setuptools, + openstack-pkg-tools (>= 99~), python3-sphinx, python3-all, - python3-pbr (>= 2.0.0), + python3-pbr, python3-setuptools, Build-Depends-Indep: + python3-coverage, + python3-hacking, + python3-oslosphinx, python3-futurist, python3-nose, python3-oslotest, @@ -26,8 +25,8 @@ python3-testscenarios, python3-testtools, python3-urllib3, - python3-subunit, - python3-testrepository, + subunit, + testrepository, Standards-Version: 4.1.3 Vcs-Browser: https://salsa.debian.org/openstack-team/python/python-etcd3gw Vcs-Git: https://salsa.debian.org/openstack-team/python/python-etcd3gw.git @@ -48,7 +47,7 @@ Architecture: all Depends: python3-futurist, - python3-pbr (>= 2.0.0), + python3-pbr, python3-requests, python3-six, python3-urllib3, diff -Nru python-etcd3gw-0.2.1/debian/copyright python-etcd3gw-0.2.1/debian/copyright --- python-etcd3gw-0.2.1/debian/copyright 2019-07-11 05:40:52.000000000 +0000 +++ python-etcd3gw-0.2.1/debian/copyright 2019-09-02 10:32:47.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: etcd3gw Source: https://github.com/dims/etcd3-gateway diff -Nru python-etcd3gw-0.2.1/debian/gbp.conf python-etcd3gw-0.2.1/debian/gbp.conf --- python-etcd3gw-0.2.1/debian/gbp.conf 2019-07-11 05:40:52.000000000 +0000 +++ python-etcd3gw-0.2.1/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -[DEFAULT] -pristine-tar = True -compression = xz - -[buildpackage] -export-dir = ../build-area/ - diff -Nru python-etcd3gw-0.2.1/debian/patches/0001_reproducible-build.patch python-etcd3gw-0.2.1/debian/patches/0001_reproducible-build.patch --- python-etcd3gw-0.2.1/debian/patches/0001_reproducible-build.patch 1970-01-01 00:00:00.000000000 +0000 +++ python-etcd3gw-0.2.1/debian/patches/0001_reproducible-build.patch 2019-09-02 10:32:47.000000000 +0000 @@ -0,0 +1,25 @@ +Description: Make the package reproducible +Author: Chris Lamb +Forwarded: https://github.com/dims/etcd3-gateway/pull/30 +Bug-Debian: https://bugs.debian.org/934918 +Last-Update: 2019-09-02 + +--- python-etcd3gw-0.2.1.orig/etcd3gw/client.py ++++ python-etcd3gw-0.2.1/etcd3gw/client.py +@@ -115,13 +115,15 @@ class Etcd3Client(object): + json={"TTL": ttl, "ID": 0}) + return Lease(int(result['ID']), client=self) + +- def lock(self, id=str(uuid.uuid4()), ttl=DEFAULT_TIMEOUT): ++ def lock(self, id=None, ttl=DEFAULT_TIMEOUT): + """Create a Lock object given an ID and timeout + + :param id: ID for the lock, creates a new uuid if not provided + :param ttl: timeout + :return: Lock object + """ ++ if id is None: ++ id = str(uuid.uuid4()) + return Lock(id, ttl=ttl, client=self) + + def create(self, key, value): diff -Nru python-etcd3gw-0.2.1/debian/patches/series python-etcd3gw-0.2.1/debian/patches/series --- python-etcd3gw-0.2.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ python-etcd3gw-0.2.1/debian/patches/series 2019-09-02 10:32:47.000000000 +0000 @@ -0,0 +1 @@ +0001_reproducible-build.patch diff -Nru python-etcd3gw-0.2.1/debian/python3-etcd3gw.install python-etcd3gw-0.2.1/debian/python3-etcd3gw.install --- python-etcd3gw-0.2.1/debian/python3-etcd3gw.install 1970-01-01 00:00:00.000000000 +0000 +++ python-etcd3gw-0.2.1/debian/python3-etcd3gw.install 2019-09-02 10:32:47.000000000 +0000 @@ -0,0 +1 @@ +/usr/* \ No newline at end of file diff -Nru python-etcd3gw-0.2.1/debian/rules python-etcd3gw-0.2.1/debian/rules --- python-etcd3gw-0.2.1/debian/rules 2019-07-11 05:40:52.000000000 +0000 +++ python-etcd3gw-0.2.1/debian/rules 2019-09-02 10:32:47.000000000 +0000 @@ -1,25 +1,32 @@ #!/usr/bin/make -f +UPSTREAM_GIT := https://github.com/dims/etcd3gw.git include /usr/share/openstack-pkg-tools/pkgos.make %: dh $@ --buildsystem=python_distutils --with python3,sphinxdoc -override_dh_auto_install: - pkgos-dh_auto_install --no-py2 +override_dh_auto_clean: + rm -rf build + find . -iname '*.pyc' -delete + for i in $$(find . -type d -iname __pycache__) ; do rm -rf $$i ; done override_dh_auto_test: + echo "Do nothing..." + +override_dh_auto_build: + echo "Do nothing..." + +override_dh_auto_install: + pkgos-dh_auto_install --no-py2 --in-tmp + ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) pkgos-dh_auto_test --no-py2 'etcd3gw\.tests.*' endif - override_dh_sphinxdoc: ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS))) - sphinx-build -b html doc/source debian/python-etcd3gw-doc/usr/share/doc/python-etcd3gw-doc/html - dh_sphinxdoc -O--buildsystem=python_distutils + python3 -m sphinx -b html doc/source debian/python-etcd3gw-doc/usr/share/doc/python-etcd3gw-doc/html + dh_sphinxdoc endif -override_dh_clean: - dh_clean -O--buildsystem=python_distutils - rm -rf build