mirror of
git://git.yoctoproject.org/meta-virtualization.git
synced 2025-07-19 20:59:41 +02:00
a1d06c7470
The major changes include: d4451659 Bump 1.26.0 3d94f442 Bump 1.26.0-rc5 1386a855 Merge pull request #7485 from ulyssessouza/fix-https-daemon 8034c96d Bump docker-py 48d09369 Fix flake8 errors 28bf47ce Pin wcwidth==0.1.9 d279b7a8 Bump 1.26.0-rc4 83371df2 Merge branch 'master' into 1.26.x 9c5351cf Merge pull request #7389 from ulyssessouza/general-bumps-for-1_26 836e2b7c General bumps 266d287e Merge pull request #7390 from ulyssessouza/remove-unused-resources d64f3f39 Remove unused files 4e310a94 Merge pull request #7386 from ulyssessouza/bump-python-dotenv-1_13_0 d52b51e8 Bump python-dotenv from 0.11.0 to 0.13.0 64a6a48b Merge pull request #7345 from docker/dependabot/pip/certifi-2020.4.5.1 0979c7a1 Merge pull request #7380 from joehattori/simplify-code ce782b59 Simplify code in compose/config/config.py b7d6dc79 Bump certifi from 2019.11.28 to 2020.4.5.1 c22a2510 Merge pull request #7374 from ulyssessouza/fix-distro-guess a62a1e1d Add "distro" package afc5d205 Merge pull request #7371 from ulyssessouza/bump-openssl-111f 4d2afc07 Merge pull request #7372 from ulyssessouza/update-changelog Have verified on arm/arm64/x86_64 against: https://docs.docker.com/compose/gettingstarted Signed-off-by: Ming Liu <ming.liu@toradex.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
65 lines
1.8 KiB
Diff
65 lines
1.8 KiB
Diff
From 1d358acd46c9ca71d848fca8c2d677414257f247 Mon Sep 17 00:00:00 2001
|
|
From: Chen Qi <Qi.Chen@windriver.com>
|
|
Date: Fri, 22 Nov 2019 09:24:58 +0800
|
|
Subject: [PATCH] setup.py: remove maximum version requirements
|
|
|
|
Remove maximum version requirements so that docker-compose will not
|
|
require old version recipes.
|
|
|
|
Upstream-Status: Inappropriate [OE Specific]
|
|
|
|
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
|
|
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
|
|
---
|
|
setup.py | 26 +++++++++++++-------------
|
|
1 file changed, 13 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/setup.py b/setup.py
|
|
index 110441dc..eef28254 100644
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -30,18 +30,18 @@ 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',
|
|
]
|
|
|
|
|
|
@@ -61,7 +61,7 @@ extras_require = {
|
|
':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'],
|
|
+ 'socks': ['PySocks >= 1.5.6, != 1.5.7'],
|
|
'tests': tests_require,
|
|
}
|
|
|
|
|
|
--
|
|
2.25.0
|
|
|