PR#4: 3.0.1 - rpms/python-docker - src.fedoraproject.org

rpms / python-docker

#4 3.0.1

Merged 6 years ago by ttomecek. Opened 6 years ago by ttomecek.

rpms/ ttomecek/python-docker 301-update into master

3.0.1

Tomas Tomecek • 6 years ago

4d73ff1

.gitignore

file modified

		`@@ -11,3 +11,4 @@`
		`tests/tests.retry`
		`tests/atomic.qcow2`
		`/docker-2.7.0.tar.gz`
		`+ /docker-3.0.1.tar.gz`

python-docker.spec

file modified

+20 -8

		`@@ -10,7 +10,7 @@`
		`%global srcname docker`

		`Name: python-%{srcname}`
		`- Version: 2.7.0`
		`+ Version: 3.0.1`
		`Release: 1%{?dist}`
		`Summary: A Python library for the Docker Engine API`
		`License: ASL 2.0`
		`@@ -21,7 +21,7 @@`
		`# Environment markers were first added in setuptools 20.6.8, so that doesn't`
		`# work in RHEL. This patch converts those environment markers into simple if`
		`# statements.`
		`- Patch2: remove-environment-markers.patch`
		`+ Patch2: remove-environment-markers.patch`

		`# Upstream uses pip to check if the older docker-py module is installed. We`
		`# handle that with an obsolete.`
		`@@ -45,17 +45,20 @@`
		`BuildRequires: %{?fedora:python2-}pytest >= 2.9.1`
		`BuildRequires: python%{?fedora:2}-requests >= 2.14.2`
		`BuildRequires: python%{?fedora:2}-six >= 1.4.0`
		`- BuildRequires: python-websocket-client >= 0.32.0`
		`+ BuildRequires: python%{?fedora:2}-websocket-client >= 0.32.0`
		`BuildRequires: python%{?fedora:2}-docker-pycreds >= 0.2.1`
		`BuildRequires: python%{?fedora:2}-backports-ssl_match_hostname >= 3.5`
		`- BuildRequires: python-ipaddress >= 1.0.16`
		`+ BuildRequires: python%{?fedora:2}-ipaddress >= 1.0.16`
		`%endif # tests`
		`Requires: python%{?fedora:2}-requests >= 2.14.2`
		`Requires: python%{?fedora:2}-six >= 1.4.0`
		`- Requires: python-websocket-client >= 0.32.0`
		`+ Requires: python%{?fedora:2}-websocket-client >= 0.32.0`
		`Requires: python%{?fedora:2}-docker-pycreds >= 0.2.1`
		`Requires: python%{?fedora:2}-backports-ssl_match_hostname >= 3.5`
		`- Requires: python-ipaddress >= 1.0.16`
		`+ Requires: python%{?fedora:2}-ipaddress >= 1.0.16`
		`+ Requires: python%{?fedora:2}-pyOpenSSL`
		`+ Requires: python%{?fedora:2}-idna`
		`+ Requires: python%{?fedora:2}-cryptography`

		`%if 0%{?fedora} >= 26`
		`Obsoletes: python-docker-py < 1:2`
		`@@ -74,10 +77,13 @@`
		`Requires: %{?fedora:python2-}pytest >= 2.9.1`
		`Requires: python%{?fedora:2}-requests >= 2.14.2`
		`Requires: python%{?fedora:2}-six >= 1.4.0`
		`- Requires: python-websocket-client >= 0.32.0`
		`+ Requires: python%{?fedora:2}-websocket-client >= 0.32.0`
		`Requires: python%{?fedora:2}-docker-pycreds >= 0.2.1`
		`Requires: python%{?fedora:2}-backports-ssl_match_hostname >= 3.5`
		`- Requires: python-ipaddress >= 1.0.16`
		`+ Requires: python%{?fedora:2}-ipaddress >= 1.0.16`
		`+ Requires: python%{?fedora:2}-pyOpenSSL`
		`+ Requires: python%{?fedora:2}-idna`
		`+ Requires: python%{?fedora:2}-cryptography`
		`%description tests`
		`Upstream test-suite (unit, integration) packaged as RPM.`

		`@@ -100,6 +106,9 @@`
		`Requires: python3-six >= 1.4.0`
		`Requires: python3-websocket-client >= 0.32.0`
		`Requires: python3-docker-pycreds >= 0.2.1`
		`+ Requires: python3-pyOpenSSL`
		`+ Requires: python3-idna`
		`+ Requires: python3-cryptography`

		`%if 0%{?fedora} >= 26`
		`Obsoletes: python3-docker-py < 1:2`
		`@@ -162,6 +171,9 @@`
		`%{_libexecdir}/installed-tests`

		`%changelog`
		`+ * Wed Feb 07 2018 Tomas Tomecek <ttomecek@redhat.com> - 3.0.1-1`
		`+ - New upstream release 3.0.1`
		`+`
		`* Wed Dec 27 2017 Carl George <carl@george.computer> - 2.7.0-1`
		`- Latest upstream rhbz#1527712`
		`- Drop patch1, requirements.txt does not affect final installation`

remove-environment-markers.patch

file modified

+19 -11

		`@@ -1,12 +1,13 @@`
		`Generate requirements list dynamically instead of using environment markers.`
		`This allows using versions of setuptools older than 20.6.8.`

		`- diff -Nurp docker-2.5.1.orig/setup.py docker-2.5.1/setup.py`
		`- --- docker-2.5.1.orig/setup.py 2017-08-22 18:44:35.000000000 -0500`
		`- +++ docker-2.5.1/setup.py 2017-09-05 12:06:03.280017598 -0500`
		`- @@ -29,23 +29,14 @@ requirements = [`
		`- if sys.platform == 'win32':`
		`- requirements.append('pypiwin32 >= 219')`
		`+ diff --git a/setup.py b/setup.py`
		`+ index b628f4a..aaf23a0 100644`
		`+ --- a/setup.py`
		`+ +++ b/setup.py`
		`+ @@ -26,29 +26,17 @@ requirements = [`
		`+ 'docker-pycreds >= 0.2.1'`
		`+ ]`

		`-extras_require = {`
		`- ':python_version < "3.5"': 'backports.ssl_match_hostname >= 3.5',`
		`@@ -14,7 +15,17 @@`
		`- # ssl_match_hostname to verify hosts match with certificates via`
		`- # ServerAltname: https://pypi.python.org/pypi/backports.ssl_match_hostname`
		`- ':python_version < "3.3"': 'ipaddress >= 1.0.16',`
		`- -`
		`+ +if sys.platform == 'win32':`
		`+ + requirements.append('pypiwin32 >= 219')`
		`+`
		`+ - # win32 APIs if on Windows (required for npipe support)`
		`+ - # Python 3.6 is only compatible with v220 ; Python < 3.5 is not supported`
		`+ - # on v220 ; ALL versions are broken for v222 (as of 2018-01-26)`
		`+ - ':sys_platform == "win32" and python_version < "3.6"': 'pypiwin32==219',`
		`+ - ':sys_platform == "win32" and python_version >= "3.6"': 'pypiwin32==220',`
		`+ +if sys.version_info[:2] < (3, 5):`
		`+ + requirements.append('backports.ssl_match_hostname >= 3.5')`
		`+`
		`- # If using docker-py over TLS, highly recommend this option is`
		`- # pip-installed or pinned.`
		`-`
		`@@ -25,9 +36,6 @@`
		`- # 'requests[security] >= 2.5.2, != 2.11.0, != 2.12.2'`
		`- 'tls': ['pyOpenSSL>=0.14', 'cryptography>=1.3.4', 'idna>=2.0.0'],`
		`-}`
		`- +if sys.version_info[:2] < (3, 5):`
		`- + requirements.append('backports.ssl_match_hostname >= 3.5')`
		`- +`
		`+# While not imported explicitly, the ipaddress module is required for`
		`+# ssl_match_hostname to verify hosts match with certificates via`
		`+# ServerAltname: https://pypi.python.org/pypi/backports.ssl_match_hostname`
		`@@ -36,7 +44,7 @@`

		`version = None`
		`exec(open('docker/version.py').read())`
		`- @@ -72,7 +63,6 @@ setup(`
		`+ @@ -75,7 +63,6 @@ setup(`
		`packages=find_packages(exclude=["tests.*", "tests"]),`
		`install_requires=requirements,`
		`tests_require=test_requirements,`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (docker-2.7.0.tar.gz) = e6623631cafa886f780ab1c7835bdbc5cbdeb747d14c2ea6b0694977683f2e97e4a3a484f0f80b10c23d67696af2c505db21e53d4f929b223af71fc49225a9c3`
		`+ SHA512 (docker-3.0.1.tar.gz) = 1ffc3010b8f1090a5fb042c8f457823c609f45ecbf9fc7f15216f12b8674d8f0bde78ed7ae50ea50f0e1c8ba5034ce4d529bb3d67096c29531e7bf106f62bd5c`