From ad4bb6f8bbc372a2354dd79e216b13b6fb0af6a0 Mon Sep 17 00:00:00 2001
From: Tomas Tomecek <ttomecek@redhat.com>
Date: Oct 01 2019 09:09:26 +0000
Subject: drop env markers patch


the patch was kept here for sake of CentOS 7, now that we have CentOS 8
w/o docker, I don't think this is needed any more.

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>

---

diff --git a/python-docker.spec b/python-docker.spec
index e864c9d..34d2a48 100644
--- a/python-docker.spec
+++ b/python-docker.spec
@@ -15,24 +15,12 @@
 
 Name:           python-%{srcname}
 Version:        4.0.2
-Release:        1%{?dist}
+Release:        2%{?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
 
-
-# PATCHES FROM SOURCE GIT:
-
-# remove environment markers
-# Author: Tomas Tomecek <ttomecek@redhat.com>
-Patch0001: 0001-374c5e9126bbc05567e1b632e81cb035fe2b3039.patch
-
-
-
-%global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);}
-
-BuildRequires:  git-core
 BuildArch:      noarch
 
 %description
@@ -104,17 +92,6 @@ run containers, manage containers, manage Swarms, etc.
 %prep
 %setup -n %{srcname}-%{version}
 rm -fr docker.egg-info
-%if %{num_patches}
-git init
-git config user.email "noreply@example.com"
-git config user.name "John Foo"
-git add .
-git commit -a -q -m "%{version} baseline."
-# rebase-helper strips patch metadata, need to do apply & commit instead
-# https://github.com/rebase-helper/rebase-helper/issues/566
-git apply %{patches}
-git commit -a -q -m "all patches applied"
-%endif
 
 %build
 %if %{with python2}
@@ -161,6 +138,9 @@ cp -avr tests/ %{buildroot}%{_libexecdir}/installed-tests/%{name}/
 %endif # tests
 
 %changelog
+* Tue Oct 01 2019 Tomas Tomecek <ttomecek@redhat.com> - 4.0.2-2
+- drop env markers patch
+
 * Fri Sep 13 2019 Tomas Tomecek <ttomecek@redhat.com> - 4.0.2-1
 - new upstream release: 4.0.2
 
diff --git a/remove-environment-markers.patch b/remove-environment-markers.patch
deleted file mode 100644
index 7ff3b3d..0000000
--- a/remove-environment-markers.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 94fbdf4..466f7a0 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 setup, find_packages
- 
-@@ -14,38 +15,19 @@ requirements = [
-     'websocket-client >= 0.32.0',
-     'docker-pycreds >= 0.4.0',
-     'requests >= 2.14.2, != 2.18.0',
-+    'pyOpenSSL>=17.5.0',
-+    'cryptography>=1.3.4',
-+    'idna>=2.0.0',
-+    'paramiko>=2.4.2',
- ]
- 
--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',
--
--    # urllib3 drops support for Python 3.3 in 1.23
--    ':python_version == "3.3"': 'urllib3 < 1.23',
--
--    # 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())
-@@ -74,8 +56,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.*',
-     zip_safe=False,
-     test_suite='tests',
-     classifiers=[