diff --git a/allow-older-setuptools.patch b/allow-older-setuptools.patch deleted file mode 100644 index 2694d4858b474a6359b9ddc3fc94353b11b8adc4..0000000000000000000000000000000000000000 --- a/allow-older-setuptools.patch +++ /dev/null @@ -1,53 +0,0 @@ -Upstream uses environment markers to conditionally apply some dependencies. -Environment markers were first added in setuptools 20.6.8. - -diff -Nurp docker-compose-1.18.0.orig/setup.py docker-compose-1.18.0/setup.py ---- docker-compose-1.18.0.orig/setup.py 2017-12-06 19:34:46.000000000 -0600 -+++ docker-compose-1.18.0/setup.py 2017-12-26 18:09:04.896020834 -0600 -@@ -42,6 +42,17 @@ install_requires = [ - 'jsonschema >= 2.5.1, < 3', - ] - -+if sys.version_info[:2] < (3, 4): -+ install_requires.append('enum34 >= 1.0.4') -+ -+if sys.version_info[:2] < (3, 5): -+ install_requires.append('backports.ssl_match_hostname >= 3.5') -+ -+if sys.version_info[:2] < (3, 3): -+ install_requires.append('ipaddress >= 1.0.16') -+ -+if sys.platform == 'win32': -+ install_requires.append('colorama >= 0.3.9') - - tests_require = [ - 'pytest', -@@ -52,27 +63,10 @@ if sys.version_info[:2] < (3, 4): - tests_require.append('mock >= 1.0.1') - - extras_require = { -- ':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'], -- ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'], -- ':python_version < "3.3"': ['ipaddress >= 1.0.16'], -- ':sys_platform == "win32"': ['colorama >= 0.3.9, < 0.4'], - 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'], - } - - --try: -- if 'bdist_wheel' not in sys.argv: -- for key, value in extras_require.items(): -- if key.startswith(':') and pkg_resources.evaluate_marker(key[1:]): -- install_requires.extend(value) --except Exception as e: -- print("Failed to compute platform dependencies: {}. ".format(e) + -- "All dependencies will be installed as a result.", file=sys.stderr) -- for key, value in extras_require.items(): -- if key.startswith(':'): -- install_requires.extend(value) -- -- - setup( - name='docker-compose', - version=find_version("compose", "__init__.py"), - diff --git a/docker-compose-1.22.0.tar.gz b/docker-compose-1.22.0.tar.gz deleted file mode 100644 index 5c65aaa3cefb2c8795e3fbefcaf20d95c37322de..0000000000000000000000000000000000000000 Binary files a/docker-compose-1.22.0.tar.gz and /dev/null differ diff --git a/docker-compose-1.29.2.tar.gz b/docker-compose-1.29.2.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..ff2ddff004fc0eb1a48c0da781d95c8b82bd247c Binary files /dev/null and b/docker-compose-1.29.2.tar.gz differ diff --git a/docker-compose.spec b/docker-compose.spec index 95fb1d92438878627798c17a8d93c695ae631f0d..ce587f127fdbe763034e72adbc19553114d533b6 100644 --- a/docker-compose.spec +++ b/docker-compose.spec @@ -1,39 +1,52 @@ -%global debug_package %{nil} - -Name: docker-compose -Version: 1.22.0 -Release: 4 -Summary: Multi-container orchestration for Docker -License: ASL 2.0 -URL: https://github.com/docker/compose -Source0: https://files.pythonhosted.org/packages/source/d/%{name}/%{name}-%{version}.tar.gz -Patch0: allow-older-setuptools.patch -Patch1: modify-the-limit-maximum-version.patch - -Provides: fig = %{version}-%{release} -Obsoletes: fig <= 1.0.1-3 - -BuildRequires: python%{?python3_pkgversion}-devel -BuildRequires: python%{?python3_pkgversion}-setuptools - -Requires: python%{?python3_pkgversion}-cached_property >= 1.3.0 -Requires: python%{?python3_pkgversion}-docker >= 3.4.1 -Requires: python%{?python3_pkgversion}-docker-pycreds >= 0.3.0 -Requires: python%{?python3_pkgversion}-dockerpty >= 0.4.1 -Requires: python%{?python3_pkgversion}-docopt >= 0.6.2 -Requires: python%{?python3_pkgversion}-idna >= 2.5 -Requires: python%{?python3_pkgversion}-jsonschema >= 2.6.0 -Requires: python%{?python3_pkgversion}-pysocks >= 1.6.7 -Requires: python%{?python3_pkgversion}-requests >= 2.18.4 -Requires: python%{?python3_pkgversion}-setuptools -Requires: python%{?python3_pkgversion}-six >= 1.10.0 -Requires: python%{?python3_pkgversion}-texttable >= 0.9.1 -Requires: python%{?python3_pkgversion}-websocket-client >= 0.32.0 -Requires: python%{?python3_pkgversion}-yaml >= 3.12 -Requires: python%{?python3_pkgversion}-enum34 >= 1.0.4 -Requires: python%{?python3_pkgversion}-ipaddress >= 1.0.16 - -BuildArch: noarch +Name: docker-compose +Version: 1.29.2 +Release: 1 +Summary: Multi-container orchestration for Docker +License: ASL-2.0 +URL: https://github.com/docker/compose +Source0: %pypi_source +BuildArch: noarch + +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-setuptools +BuildRequires: python%{python3_pkgversion}-pytest +BuildRequires: python%{python3_pkgversion}-distro +BuildRequires: python%{python3_pkgversion}-ddt +BuildRequires: python%{python3_pkgversion}-cached_property >= 1.5.1 +BuildRequires: python%{python3_pkgversion}-chardet >= 3.0.4 +BuildRequires: python%{python3_pkgversion}-distro >= 1.5.0 +BuildRequires: python%{python3_pkgversion}-docker >= 5.0.0 +BuildRequires: python%{python3_pkgversion}-docker-pycreds >= 0.4.0 +BuildRequires: python%{python3_pkgversion}-dockerpty >= 0.4.1 +BuildRequires: python%{python3_pkgversion}-docopt >= 0.6.2 +BuildRequires: python%{python3_pkgversion}-idna >= 2.10 +BuildRequires: python%{python3_pkgversion}-jsonschema >= 3.2.0 +BuildRequires: python%{python3_pkgversion}-pysocks >= 1.7.1 +BuildRequires: python%{python3_pkgversion}-requests >= 2.24.0 +BuildRequires: python%{python3_pkgversion}-six >= 1.12.0 +BuildRequires: python%{python3_pkgversion}-texttable >= 1.6.2 +BuildRequires: python%{python3_pkgversion}-websocket-client >= 0.57.0 +BuildRequires: python%{python3_pkgversion}-yaml >= 5.4.1 +Requires: python%{python3_pkgversion}-setuptools +Requires: python%{python3_pkgversion}-cached_property >= 1.5.1 +Requires: python%{python3_pkgversion}-chardet >= 3.0.4 +Requires: python%{python3_pkgversion}-distro >= 1.5.0 +Requires: python%{python3_pkgversion}-docker >= 5.0.0 +Requires: python%{python3_pkgversion}-docker-pycreds >= 0.4.0 +Requires: python%{python3_pkgversion}-dockerpty >= 0.4.1 +Requires: python%{python3_pkgversion}-docopt >= 0.6.2 +Requires: python%{python3_pkgversion}-idna >= 2.10 +Requires: python%{python3_pkgversion}-jsonschema >= 3.2.0 +Requires: python%{python3_pkgversion}-pysocks >= 1.7.1 +Requires: python%{python3_pkgversion}-requests >= 2.24.0 +Requires: python%{python3_pkgversion}-six >= 1.12.0 +Requires: python%{python3_pkgversion}-texttable >= 1.6.2 +Requires: python%{python3_pkgversion}-websocket-client >= 0.57.0 +Requires: python%{python3_pkgversion}-yaml >= 5.4.1 + +Requires: python%{python3_pkgversion}-attrs >= 20.3.0 +Requires: python%{python3_pkgversion}-certifi >= 2020.6.20 + %description Compose is a tool for defining and running multi-container Docker @@ -55,7 +68,9 @@ Using Compose is basically a three-step process. %prep %autosetup -p 1 -#Remove irrelevant dependency version constraints +rm -rf docker_compose.egg-info + +# Remove dependency version constraints sed -e 's/, < [0-9.]\+//' -i setup.py %build @@ -68,8 +83,8 @@ install -D -p -m 644 contrib/completion/zsh/_docker-compose %{buildroot}%{_datad install -D -p -m 644 contrib/completion/fish/docker-compose.fish %{buildroot}%{_datadir}/fish/vendor_completions.d/docker-compose.fish %files -%doc CHANGELOG.md README.rst %license LICENSE +%doc CHANGELOG.md README.md %{_bindir}/%{name} %{python3_sitelib}/* %{_datadir}/bash-completion @@ -77,6 +92,9 @@ install -D -p -m 644 contrib/completion/fish/docker-compose.fish %{buildroot}%{_ %{_datadir}/fish %changelog +* Wed Nov 22 2023 konglidong - 1.29.2-1 +- update version to 1.29.2 + * Fri Sep 11 2020 tianwei - 1.22.0-4 - remove irrelevant dependency version constraints diff --git a/modify-the-limit-maximum-version.patch b/modify-the-limit-maximum-version.patch deleted file mode 100644 index a00bafd4ece00a22d36555ba2e00357a82ab4a5c..0000000000000000000000000000000000000000 --- a/modify-the-limit-maximum-version.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 57c29cf8128373e4317f89beec4fe9181c485319 Mon Sep 17 00:00:00 2001 -From: liuchao -Date: Sat, 29 Feb 2020 09:52:02 +0800 -Subject: [PATCH] modify the limit maximum version - ---- - setup.py | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/setup.py b/setup.py -index e0a26b0..aec9e3a 100644 ---- a/setup.py -+++ b/setup.py -@@ -32,11 +32,11 @@ def find_version(*file_paths): - install_requires = [ - 'cached-property >= 1.2.0, < 2', - 'docopt >= 0.6.1, < 0.7', -- 'PyYAML >= 3.10, < 4', -- 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.19', -- 'texttable >= 0.9.0, < 0.10', -+ 'PyYAML >= 3.10, < 5.4', -+ 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.22', -+ 'texttable >= 0.9.0, < 1.50', - 'websocket-client >= 0.32.0, < 1.0', -- 'docker >= 3.4.1, < 4.0', -+ 'docker >= 3.4.1, < 4.1', - 'dockerpty >= 0.4.1, < 0.5', - 'six >= 1.3.0, < 2', - 'jsonschema >= 2.5.1, < 3', --- -1.8.3.1 -