Control: tags -1 + patch Hello!
Would be nice to see progress on this. Despite knowing nothing about python packaging here's my attempt at offering something: debcheckout -a --git-track '*' python-docker cd python-docker gbp import-orig --uscan --pristine-tar --merge-mode=replace # import 1.9.0 git am fix-patches.patch # attached to this mail. gbp dch --auto This creates a buildable package.... Review from someone who knows how to really deal with python packaging welcome. Specially note that the (existing) patch lowers the requirements in one place which should be checked if it's still valid: -websocket-client==0.32.0 +websocket-client>=0.18.0 If not, then websocket-client will also need to be updated in Debian. See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=810088 Regards, Andreas Henriksson
>From 94b5cfb5f9ef08fb930174b93c8b7706937826ee Mon Sep 17 00:00:00 2001 From: Andreas Henriksson <[email protected]> Date: Mon, 5 Sep 2016 18:40:54 +0200 Subject: [PATCH] Update debian/patches/*.patch to apply again. --- ...r-API-version-to-1.20-for-Docker-1.8.3-co.patch | 9 ++++---- debian/patches/requirements.patch | 27 ++++++++++------------ 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/debian/patches/0002-Lower-Docker-API-version-to-1.20-for-Docker-1.8.3-co.patch b/debian/patches/0002-Lower-Docker-API-version-to-1.20-for-Docker-1.8.3-co.patch index fca3ee3..f5b12bc 100644 --- a/debian/patches/0002-Lower-Docker-API-version-to-1.20-for-Docker-1.8.3-co.patch +++ b/debian/patches/0002-Lower-Docker-API-version-to-1.20-for-Docker-1.8.3-co.patch @@ -7,12 +7,13 @@ Subject: Lower Docker API version to 1.20 for Docker 1.8.3 compatibility docker/constants.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/docker/constants.py b/docker/constants.py -index 0627ba0..3647a3b 100644 --- a/docker/constants.py +++ b/docker/constants.py -@@ -1,4 +1,4 @@ --DEFAULT_DOCKER_API_VERSION = '1.21' +@@ -1,7 +1,7 @@ + import sys + from .version import version + +-DEFAULT_DOCKER_API_VERSION = '1.22' +DEFAULT_DOCKER_API_VERSION = '1.20' DEFAULT_TIMEOUT_SECONDS = 60 STREAM_HEADER_SIZE_BYTES = 8 diff --git a/debian/patches/requirements.patch b/debian/patches/requirements.patch index 86cc240..8beb07d 100644 --- a/debian/patches/requirements.patch +++ b/debian/patches/requirements.patch @@ -13,31 +13,31 @@ Patch-Name: requirements.patch test-requirements.txt | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-) -diff --git a/docker_py.egg-info/requires.txt b/docker_py.egg-info/requires.txt -index 43cfa6a..aa5b97e 100644 --- a/docker_py.egg-info/requires.txt +++ b/docker_py.egg-info/requires.txt -@@ -1,3 +1,3 @@ +@@ -1,6 +1,6 @@ -requests >= 2.5.2 +requests >= 2.5.3 six >= 1.4.0 -websocket-client >= 0.32.0 +websocket-client >= 0.18.0 -diff --git a/requirements.txt b/requirements.txt -index 72c255d..cd79880 100644 + + [:python_version < "3.3"] + ipaddress >= 1.0.16 --- a/requirements.txt +++ b/requirements.txt -@@ -1,3 +1,3 @@ +@@ -1,5 +1,5 @@ -requests==2.5.3 +requests>=2.5.3 six>=1.4.0 -websocket-client==0.32.0 +websocket-client>=0.18.0 -diff --git a/setup.py b/setup.py -index 6d86163..f2af6b9 100644 + backports.ssl_match_hostname>=3.5 ; python_version < '3.5' + ipaddress==1.0.16 ; python_version < '3.3' +\ No newline at end of file --- a/setup.py +++ b/setup.py -@@ -7,9 +7,9 @@ ROOT_DIR = os.path.dirname(__file__) +@@ -9,9 +9,9 @@ SOURCE_DIR = os.path.join(ROOT_DIR) requirements = [ @@ -48,20 +48,17 @@ index 6d86163..f2af6b9 100644 + 'websocket-client >= 0.18.0', ] - exec(open('docker/version.py').read()) -diff --git a/test-requirements.txt b/test-requirements.txt -index be49988..45b2b38 100644 + if sys.platform == 'win32': --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,5 +1,5 @@ -mock==1.0.1 --pytest==2.7.2 +-pytest==2.9.1 -coverage==3.7.1 -pytest-cov==2.1.0 -flake8==2.4.1 -\ No newline at end of file +mock>=1.0.1 -+pytest>=2.7.2 ++pytest>=2.9.1 +coverage>=3.7.1 +pytest-cov>=2.1.0 +flake8>=2.4.1 -- 2.9.3
_______________________________________________ Python-modules-team mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/python-modules-team
