Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
55fff6084f
!13 fix spec changelog date
From: @leeffo 
Reviewed-by: @duguhaotian 
Signed-off-by: @duguhaotian
2022-12-07 08:06:17 +00:00
mylee
1e63a6b18b fix spec changelog date 2022-05-12 17:23:33 +08:00
openeuler-ci-bot
3972ad188a !10 Remove irrelevant dependency
From: @weiwei_150212
Reviewed-by: @small_leek
Signed-off-by: @small_leek
2020-09-11 14:42:14 +08:00
s17723959267
43833dcc35 Remove irrelevant dependency 2020-09-11 14:32:19 +08:00
openeuler-ci-bot
7feab09c89 !4 modify the limit maximum version
Merge pull request !4 from maqiang/master
2020-07-20 12:28:39 +08:00
openeuler-ci-bot
63791c0707 !5 add yaml file to package
Merge pull request !5 from zhanzhimin/master
2020-06-28 15:40:05 +08:00
zzm_567
44b6afe6b3 add yaml file 2020-06-13 15:14:52 +08:00
orange-snn
cd3f0f4bfe modify the limit maximum version 2020-06-02 20:56:17 +08:00
openeuler-ci-bot
61858556b5 !2 modify the limit maximum version
Merge pull request !2 from HukunaMatata/master
2020-03-03 14:20:49 +08:00
HukunaMatata
ed6bc2dabd modify the limit maximum version
Signed-off-by: HukunaMatata <yuxiangyang4@huawei.com>
2020-03-02 16:44:28 +08:00
3 changed files with 49 additions and 1 deletions

View File

@ -2,12 +2,13 @@
Name: docker-compose
Version: 1.22.0
Release: 1
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
@ -54,6 +55,8 @@ 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
@ -74,5 +77,14 @@ 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

4
docker-compose.yaml Normal file
View File

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

View 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