From a651d85d35f2fc6a307426c38d7f416a9cf8d125 Mon Sep 17 00:00:00 2001 From: Tomas Tomecek Date: Jun 21 2022 15:36:30 +0000 Subject: drop the unapplied patch from git Signed-off-by: Tomas Tomecek --- diff --git a/0001-374c5e9126bbc05567e1b632e81cb035fe2b3039.patch b/0001-374c5e9126bbc05567e1b632e81cb035fe2b3039.patch deleted file mode 100644 index f8dc553..0000000 --- a/0001-374c5e9126bbc05567e1b632e81cb035fe2b3039.patch +++ /dev/null @@ -1,61 +0,0 @@ -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',