summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Pleau <jason@jpleau.ca>2018-03-30 15:47:20 -0400
committerJason Pleau <jason@jpleau.ca>2018-03-30 15:47:20 -0400
commit016e62dad4736238d1beadaff2b81f79225d7998 (patch)
tree6b114ed96d779e687ce0d007eb469e09ab85aa5b
parent721eeee2b260b0077b4036a4a3006e6a537f670d (diff)
refresh requirements.patch
-rw-r--r--debian/changelog6
-rw-r--r--debian/patches/requirements.patch30
2 files changed, 18 insertions, 18 deletions
diff --git a/debian/changelog b/debian/changelog
index 4f973e5..0fe7378 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-python-docker (2.5.1-2) UNRELEASED; urgency=medium
+python-docker (3.2.1-1) UNRELEASED; urgency=medium
+ * New upstrema release
* Update Vcs-* fields to point to salsa.d.o
+ * Refresh requirements.patch
- -- Jason Pleau <jason@jpleau.ca> Tue, 27 Feb 2018 22:17:28 -0500
+ -- Jason Pleau <jason@jpleau.ca> Fri, 30 Mar 2018 15:36:03 -0400
python-docker (2.5.1-1) unstable; urgency=medium
diff --git a/debian/patches/requirements.patch b/debian/patches/requirements.patch
index 75180e3..a3aa38b 100644
--- a/debian/patches/requirements.patch
+++ b/debian/patches/requirements.patch
@@ -5,22 +5,16 @@ Subject: Unpin dependencies so newer versions satisfy them appropriately
Forwarded: https://github.com/dotcloud/docker-py/issues/101 (upstream has no interest)
Patch-Name: requirements.patch
----
- requirements.txt | 32 ++++++++++++++++----------------
- test-requirements.txt | 10 +++++-----
- 2 files changed, 21 insertions(+), 21 deletions(-)
-diff --git a/requirements.txt b/requirements.txt
-index f3c61e7..0e013c8 100644
--- a/requirements.txt
+++ b/requirements.txt
-@@ -1,16 +1,16 @@
+@@ -1,18 +1,18 @@
-appdirs==1.4.3
-asn1crypto==0.22.0
-backports.ssl-match-hostname==3.5.0.1
-cffi==1.10.0
-cryptography==1.9
--docker-pycreds==0.2.1
+-docker-pycreds==0.2.2
-enum34==1.1.6
-idna==2.5
-ipaddress==1.0.18
@@ -28,6 +22,8 @@ index f3c61e7..0e013c8 100644
-pycparser==2.17
-pyOpenSSL==17.0.0
-pyparsing==2.2.0
+-pypiwin32==219; sys_platform == 'win32' and python_version < '3.6'
+-pypiwin32==220; sys_platform == 'win32' and python_version >= '3.6'
-requests==2.14.2
-six==1.10.0
-websocket-client==0.40.0
@@ -36,7 +32,7 @@ index f3c61e7..0e013c8 100644
+backports.ssl-match-hostname>=3.5.0.1
+cffi>=1.10.0
+cryptography>=1.9
-+docker-pycreds>=0.2.1
++docker-pycreds>=0.2.2
+enum34>=1.1.6
+idna>=2.5
+ipaddress>=1.0.18
@@ -44,21 +40,23 @@ index f3c61e7..0e013c8 100644
+pycparser>=2.17
+pyOpenSSL>=17.0.0
+pyparsing>=2.2.0
++pypiwin32>=219; sys_platform == 'win32' and python_version < '3.6'
++pypiwin32>=220; sys_platform == 'win32' and python_version >= '3.6'
+requests>=2.14.2
+six>=1.10.0
+websocket-client>=0.40.0
-diff --git a/test-requirements.txt b/test-requirements.txt
-index 460db10..9f9eb50 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
-@@ -1,5 +1,5 @@
+@@ -1,6 +1,6 @@
+-coverage==3.7.1
+-flake8==3.4.1
-mock==1.0.1
-pytest==2.9.1
--coverage==3.7.1
-pytest-cov==2.1.0
--flake8==2.4.1
+-pytest-timeout==1.2.1
++coverage>=3.7.1
++flake8>=3.4.1
+mock>=1.0.1
+pytest>=2.9.1
-+coverage>=3.7.1
+pytest-cov>=2.1.0
-+flake8>=2.4.1
++pytest-timeout>=1.2.1