diff --git a/.gitignore b/.gitignore index d15aa9a..4fe30c8 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ tests/atomic.qcow2 /docker-3.4.1.tar.gz /docker-3.5.0.tar.gz /docker-3.7.0.tar.gz +/docker-4.0.1.tar.gz diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..5cff14e --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,24 @@ +--- +specfile_path: redhat/python-docker.spec +synced_files: + - src: redhat/python-docker.spec + dest: python-docker.spec + - src: redhat/tests + dest: tests + - .packit.yaml +downstream_package_name: python-docker +upstream_project_name: docker +upstream_ref: 4.0.1 + +create_tarball_command: ["python3", "setup.py", "sdist", "--dist-dir", "."] +current_version_command: ["python3", "setup.py", "--version"] + +jobs: +- job: sync_from_downstream + trigger: commit +- job: copr_build + trigger: pull_request + metadata: + targets: + - fedora-rawhide-x86_64 + - fedora-30-x86_64 diff --git a/0001-374c5e9126bbc05567e1b632e81cb035fe2b3039.patch b/0001-374c5e9126bbc05567e1b632e81cb035fe2b3039.patch new file mode 100644 index 0000000..f8dc553 --- /dev/null +++ b/0001-374c5e9126bbc05567e1b632e81cb035fe2b3039.patch @@ -0,0 +1,61 @@ +diff --git a/setup.py b/setup.py +index c29787b..074b633 100644 +--- a/setup.py ++++ b/setup.py +@@ -3,6 +3,7 @@ from __future__ import print_function + + import codecs + import os ++import sys + + from setuptools import find_packages + from setuptools import setup +@@ -16,33 +17,13 @@ requirements = [ + 'requests >= 2.14.2, != 2.18.0', + ] + +-extras_require = { +- ':python_version < "3.5"': '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 +- ':python_version < "3.3"': 'ipaddress >= 1.0.16', +- +- # 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==223', +- +- # If using docker-py over TLS, highly recommend this option is +- # pip-installed or pinned. +- +- # TODO: if pip installing both "requests" and "requests[security]", the +- # extra package from the "security" option are not installed (see +- # https://github.com/pypa/pip/issues/4391). Once that's fixed, instead of +- # installing the extra dependencies, install the following instead: +- # 'requests[security] >= 2.5.2, != 2.11.0, != 2.12.2' +- 'tls': ['pyOpenSSL>=17.5.0', 'cryptography>=1.3.4', 'idna>=2.0.0'], +- +- # Only required when connecting using the ssh:// protocol +- 'ssh': ['paramiko>=2.4.2'], +- +-} ++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 ++if sys.version_info[:2] < (3, 3): ++ requirements.append('ipaddress >= 1.0.16') + + version = None + exec(open('docker/version.py').read()) +@@ -71,7 +52,6 @@ setup( + packages=find_packages(exclude=["tests.*", "tests"]), + install_requires=requirements, + tests_require=test_requirements, +- extras_require=extras_require, + python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*', + zip_safe=False, + test_suite='tests', diff --git a/python-docker.spec b/python-docker.spec index 2ac2bdb..efc97d0 100644 --- a/python-docker.spec +++ b/python-docker.spec @@ -14,18 +14,21 @@ %global srcname docker Name: python-%{srcname} -Version: 3.7.0 -Release: 2%{?dist} +Version: 4.0.1 +Release: 1%{?dist} Summary: A Python library for the Docker Engine API License: ASL 2.0 URL: https://pypi.org/project/%{srcname} Source0: https://files.pythonhosted.org/packages/source/d/%{srcname}/%{srcname}-%{version}.tar.gz -# Upstream uses environment markers to conditionally apply some dependencies. -# 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. -Patch1: remove-environment-markers.patch + +# PATCHES FROM SOURCE GIT: + +# remove environment markers +# Author: Tomas Tomecek +Patch0001: 0001-374c5e9126bbc05567e1b632e81cb035fe2b3039.patch + + %global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);} @@ -158,6 +161,12 @@ cp -avr tests/ %{buildroot}%{_libexecdir}/installed-tests/%{name}/ %endif # tests %changelog +* Mon May 27 2019 Frantisek Lachman - 4.0.1-1 +- New upstream release 4.0.1 + +* Fri May 24 2019 Frantisek Lachman - 4.0.0-1 +- New upstream release 4.0.0 + * Mon Feb 25 2019 Yatin Karel - 3.7.0-2 - Enable python2 build for el7 diff --git a/sources b/sources index aca648b..4520f28 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (docker-3.7.0.tar.gz) = 5ab071ea92ccf143b9a80bb25dc23fadd8c808c05bdc70356e570c17294826fcc8894ae5786581c3c9171da5b7b365e95eb2c0c27a336f8617497e751ef34dcf +SHA512 (docker-4.0.1.tar.gz) = 8afc6d89423f1a9f9b02400ba7e0582d52d5ebf6f2400b2d172586f8977b89061c9347940cd44b7fe34999578bfa0e632183bd2ab558178444dcccc9d08f61ba