Compare commits
10 Commits
6cac4d828c
...
55fff6084f
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
55fff6084f | ||
|
|
1e63a6b18b | ||
|
|
3972ad188a | ||
|
|
43833dcc35 | ||
|
|
7feab09c89 | ||
|
|
63791c0707 | ||
|
|
44b6afe6b3 | ||
|
|
cd3f0f4bfe | ||
|
|
61858556b5 | ||
|
|
ed6bc2dabd |
@ -2,12 +2,13 @@
|
|||||||
|
|
||||||
Name: docker-compose
|
Name: docker-compose
|
||||||
Version: 1.22.0
|
Version: 1.22.0
|
||||||
Release: 1
|
Release: 4
|
||||||
Summary: Multi-container orchestration for Docker
|
Summary: Multi-container orchestration for Docker
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
URL: https://github.com/docker/compose
|
URL: https://github.com/docker/compose
|
||||||
Source0: https://files.pythonhosted.org/packages/source/d/%{name}/%{name}-%{version}.tar.gz
|
Source0: https://files.pythonhosted.org/packages/source/d/%{name}/%{name}-%{version}.tar.gz
|
||||||
Patch0: allow-older-setuptools.patch
|
Patch0: allow-older-setuptools.patch
|
||||||
|
Patch1: modify-the-limit-maximum-version.patch
|
||||||
|
|
||||||
Provides: fig = %{version}-%{release}
|
Provides: fig = %{version}-%{release}
|
||||||
Obsoletes: fig <= 1.0.1-3
|
Obsoletes: fig <= 1.0.1-3
|
||||||
@ -54,6 +55,8 @@ Using Compose is basically a three-step process.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p 1
|
%autosetup -p 1
|
||||||
|
#Remove irrelevant dependency version constraints
|
||||||
|
sed -e 's/, < [0-9.]\+//' -i setup.py
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%py3_build
|
%py3_build
|
||||||
@ -74,5 +77,14 @@ install -D -p -m 644 contrib/completion/fish/docker-compose.fish %{buildroot}%{_
|
|||||||
%{_datadir}/fish
|
%{_datadir}/fish
|
||||||
|
|
||||||
%changelog
|
%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
|
* Wed Sep 11 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.22.0-1
|
||||||
- Package init
|
- Package init
|
||||||
|
|||||||
4
docker-compose.yaml
Normal file
4
docker-compose.yaml
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
version_control: pypi
|
||||||
|
src_repo: docker-compose
|
||||||
|
tag_prefix: ^v
|
||||||
|
seperator: "."
|
||||||
32
modify-the-limit-maximum-version.patch
Normal file
32
modify-the-limit-maximum-version.patch
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
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
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user