diff --git a/no-restrict-upper.patch b/no-restrict-upper.patch deleted file mode 100644 index 589f325..0000000 --- a/no-restrict-upper.patch +++ /dev/null @@ -1,64 +0,0 @@ -Index: docker-compose-1.26.0/setup.py -=================================================================== ---- docker-compose-1.26.0.orig/setup.py -+++ docker-compose-1.26.0/setup.py -@@ -30,38 +30,38 @@ def find_version(*file_paths): - - - install_requires = [ -- 'cached-property >= 1.2.0, < 2', -- 'docopt >= 0.6.1, < 1', -- 'PyYAML >= 3.10, < 6', -- 'requests >= 2.20.0, < 3', -- 'texttable >= 0.9.0, < 2', -- 'websocket-client >= 0.32.0, < 1', -- 'distro >= 1.5.0, < 2', -- 'docker[ssh] >= 3.7.0, < 5', -- 'dockerpty >= 0.4.1, < 1', -- 'six >= 1.3.0, < 2', -- 'jsonschema >= 2.5.1, < 4', -- 'python-dotenv >= 0.13.0, < 1', -+ 'cached-property >= 1.2.0', -+ 'docopt >= 0.6.1', -+ 'PyYAML >= 3.10', -+ 'requests >= 2.20.0', -+ 'texttable >= 0.9.0', -+ 'websocket-client >= 0.32.0', -+ 'distro >= 1.5.0', -+ 'docker[ssh] >= 3.7.0', -+ 'dockerpty >= 0.4.1', -+ 'six >= 1.3.0', -+ 'jsonschema >= 2.5.1', -+ 'python-dotenv >= 0.13.0', - ] - - - tests_require = [ -- 'ddt >= 1.2.2, < 2', -- 'pytest < 6', -+ 'ddt >= 1.2.2', -+ 'pytest', - ] - - - if sys.version_info[:2] < (3, 4): -- tests_require.append('mock >= 1.0.1, < 4') -+ tests_require.append('mock >= 1.0.1') - - extras_require = { -- ':python_version < "3.2"': ['subprocess32 >= 3.5.4, < 4'], -- ':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'], -- ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'], -+ ':python_version < "3.2"': ['subprocess32 >= 3.5.4'], -+ ':python_version < "3.4"': ['enum34 >= 1.0.4'], -+ ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'], - ':python_version < "3.3"': ['backports.shutil_get_terminal_size == 1.0.0', -- 'ipaddress >= 1.0.16, < 2'], -- ':sys_platform == "win32"': ['colorama >= 0.4, < 1'], -- 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'], -+ 'ipaddress >= 1.0.16'], -+ ':sys_platform == "win32"': ['colorama >= 0.4'], -+ 'socks': ['PySocks >= 1.5.6, != 1.5.7'], - 'tests': tests_require, - } - diff --git a/python-docker-compose.changes b/python-docker-compose.changes index b68f6f7..7d89278 100644 --- a/python-docker-compose.changes +++ b/python-docker-compose.changes @@ -5,6 +5,8 @@ Thu Aug 20 11:17:55 UTC 2020 - Dirk Mueller - Enforce `docker-py` 4.2.2 as minimum version when installing with pip - Bump `docker-py` from 4.2.1 to 4.2.2 - Fix context load for non-docker endpoints +- remove no-restrict-upper.patch (just uncaping stuff downstream is + likely cause problems) ------------------------------------------------------------------- Tue Jun 16 06:29:10 UTC 2020 - Steve Kowalik diff --git a/python-docker-compose.spec b/python-docker-compose.spec index fe6cfe8..5a949d1 100644 --- a/python-docker-compose.spec +++ b/python-docker-compose.spec @@ -26,7 +26,6 @@ License: Apache-2.0 Group: System/Management URL: https://pypi.python.org/pypi/docker-compose Source0: https://files.pythonhosted.org/packages/source/d/docker-compose/docker-compose-%{version}.tar.gz -Patch0: no-restrict-upper.patch BuildRequires: %{python_module PyYAML >= 3.10} BuildRequires: %{python_module cached-property >= 1.2.0} BuildRequires: %{python_module ddt >= 1.2.2} @@ -98,7 +97,6 @@ Previously known as Fig. %prep %setup -q -n docker-compose-%{version} -%patch0 -p1 %build %python_build