MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 12:50:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

docker-compose: drop patches from the removed python version

Browse Source 
Drop unused patches from the python version removed in 7bd56074.

https://git.yoctoproject.org/meta-virtualization/commit/recipes-containers/docker-compose?id=7bd56074fece944ef9279d87106eb16452ec6338

Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Jose Quaresma 2023-11-28 10:35:48 +00:00 committed by Bruce Ashfield
parent 0eef35edee
commit 9a1f4d91d9
2 changed files with 0 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
recipes-containers/docker-compose/files/0001-setup.py-import-fastentrypoints.patch
View File

@ -1,28 +0,0 @@
From f3a22f0f14a4b3313e6405dfb6c97df949493a34 Mon Sep 17 00:00:00 2001
From: Ming Liu <liu.ming50@gmail.com>
Date: Thu, 30 Jan 2020 17:22:19 +0100
Subject: [PATCH] setup.py: import fastentrypoints
Upstream-Status: Inappropriate [OE specific configuration]
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
---
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
index ad57969..3cccffc 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ import sys
import pkg_resources
from setuptools import find_packages
from setuptools import setup
-
+import fastentrypoints
def read(*parts):
path = os.path.join(os.path.dirname(__file__), *parts)
--
2.7.4

57
recipes-containers/docker-compose/files/0001-setup.py-remove-maximum-version-requirements.patch
View File

@ -1,57 +0,0 @@
From e3aca6421e003d03d119e69bf3d6b30bb5c662c9 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 | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
Index: docker-compose-1.29.1/setup.py
===================================================================
--- docker-compose-1.29.1.orig/setup.py
+++ docker-compose-1.29.1/setup.py
@@ -25,16 +25,21 @@
install_requires = [
- 'docopt >= 0.6.1, < 1',
- 'PyYAML >= 3.10, < 6',
- 'requests >= 2.20.0, < 3',
- 'texttable >= 0.9.0, < 2',
+ 'docopt >= 0.6.1',
+ 'PyYAML >= 3.10',
+ 'requests >= 2.20.0',
+ 'texttable >= 0.9.0',
'websocket-client >= 0.32.0, < 1',
'distro >= 1.5.0, < 2',
- 'docker[ssh] >= 5',
+ 'docker[ssh] >= 4.4.0, < 5',
'dockerpty >= 0.4.1, < 1',
'jsonschema >= 2.5.1, < 4',
- 'python-dotenv >= 0.13.0, < 1',
+ 'websocket-client >= 0.32.0',
+ 'distro >= 1.5.0',
+ 'docker[ssh] >= 5',
+ 'dockerpty >= 0.4.1',
+ 'jsonschema >= 2.5.1',
+ 'python-dotenv >= 0.13.0',
]
@@ -51,7 +56,7 @@
':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'],
':python_version < "3.8"': ['cached-property >= 1.2.0, < 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,
}