Compare commits

..

No commits in common. "55fff6084f27d4a3fab5feebc3d40fcd94d4a6c6" and "6cac4d828cb54734276ef1b7f723cbb7672dc45a" have entirely different histories.

3 changed files with 1 additions and 49 deletions

View File

@ -2,13 +2,12 @@
Name: docker-compose
Version: 1.22.0
Release: 4
Release: 1
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
@ -55,8 +54,6 @@ Using Compose is basically a three-step process.
%prep
%autosetup -p 1
#Remove irrelevant dependency version constraints
sed -e 's/, < [0-9.]\+//' -i setup.py
%build
%py3_build
@ -77,14 +74,5 @@ install -D -p -m 644 contrib/completion/fish/docker-compose.fish %{buildroot}%{_
%{_datadir}/fish
%changelog
* Fri Sep 11 2020 tianwei <tianwei12@huawei.com> - 1.22.0-4
- remove irrelevant dependency version constraints
* Tue Jun 2 2020 maqiang <maqiang42@huawei.com> - 1.22.0-3
- modify the limit maximum version
* Mon Mar 2 2020 liuchao <liuchao176@huawei.com> - 1.22.0-2
- modify the limit maximum version
* Wed Sep 11 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.22.0-1
- Package init

View File

@ -1,4 +0,0 @@
version_control: pypi
src_repo: docker-compose
tag_prefix: ^v
seperator: "."

View File

@ -1,32 +0,0 @@
From 57c29cf8128373e4317f89beec4fe9181c485319 Mon Sep 17 00:00:00 2001
From: liuchao <liuchao173@huawei.com>
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