forked from SolidRun/cip-project-deby
-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Christian Owono Pether <christian.owono@sodira-connect.com>
- Loading branch information
1 parent
96d7f09
commit 1698af4
Showing
4 changed files
with
149 additions
and
0 deletions.
There are no files selected for viewing
29 changes: 29 additions & 0 deletions
29
...common/recipes-containers/docker-compose/files/0001-setup.py-import-fastentrypoints.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
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 | ||
|
||
|
60 changes: 60 additions & 0 deletions
60
...s-containers/docker-compose/files/0001-setup.py-remove-maximum-version-requirements.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
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 | 22 +++++++++++----------- | ||
1 file changed, 11 insertions(+), 11 deletions(-) | ||
|
||
diff --git a/setup.py b/setup.py | ||
index 110441dc..eef28254 100644 | ||
--- a/setup.py | ||
+++ b/setup.py | ||
@@ -30,16 +30,16 @@ 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', | ||
- 'docker[ssh] >= 3.7.0, < 5', | ||
- 'dockerpty >= 0.4.1, < 1', | ||
- 'six >= 1.3.0, < 2', | ||
- 'jsonschema >= 2.5.1, < 4', | ||
+ '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', | ||
+ 'docker[ssh] >= 3.7.0', | ||
+ 'dockerpty >= 0.4.1', | ||
+ 'six >= 1.3.0', | ||
+ 'jsonschema >= 2.5.1', | ||
] | ||
|
||
|
||
@@ -58,7 +58,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'], | ||
} | ||
|
||
|
||
-- | ||
2.25.0 | ||
|
||
|
39 changes: 39 additions & 0 deletions
39
poky/meta-cip-sr-common/recipes-containers/docker-compose/python3-docker-compose_1.25.4.bb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
SUMMARY = "Multi-container orchestration for Docker" | ||
HOMEPAGE = "https://www.docker.com/" | ||
LICENSE = "Apache-2.0" | ||
LIC_FILES_CHKSUM = "file://LICENSE;md5=435b266b3899aa8a959f17d41c56def8" | ||
|
||
inherit pypi setuptools3 | ||
|
||
SRC_URI[md5sum] = "893fbb804a9057d6c470b5312407e0d1" | ||
SRC_URI[sha256sum] = "fabae2bee4abfa7bdd09125b6bbdcdda81f946c7b16e3ccc6bb2d821ef6488f3" | ||
|
||
SRC_URI += "file://0001-setup.py-remove-maximum-version-requirements.patch \ | ||
file://0001-setup.py-import-fastentrypoints.patch \ | ||
" | ||
|
||
DEPENDS += "${PYTHON_PN}-fastentrypoints-native" | ||
|
||
RDEPENDS_${PN} = "\ | ||
${PYTHON_PN}-cached-property \ | ||
${PYTHON_PN}-certifi \ | ||
${PYTHON_PN}-chardet \ | ||
${PYTHON_PN}-colorama \ | ||
${PYTHON_PN}-docker \ | ||
${PYTHON_PN}-docker-pycreds \ | ||
${PYTHON_PN}-dockerpty \ | ||
${PYTHON_PN}-docopt \ | ||
${PYTHON_PN}-fcntl \ | ||
${PYTHON_PN}-idna \ | ||
${PYTHON_PN}-jsonschema \ | ||
${PYTHON_PN}-misc \ | ||
${PYTHON_PN}-paramiko \ | ||
${PYTHON_PN}-pyyaml \ | ||
${PYTHON_PN}-requests \ | ||
${PYTHON_PN}-six \ | ||
${PYTHON_PN}-terminal \ | ||
${PYTHON_PN}-texttable \ | ||
${PYTHON_PN}-urllib3 \ | ||
${PYTHON_PN}-websocket-client \ | ||
" | ||
|
21 changes: 21 additions & 0 deletions
21
poky/meta-cip-sr-common/recipes-devtools/python/python3-fastentrypoints_0.12.bb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
SUMMARY = "Make entry_points specified in setup.py load more quickly" | ||
DESCRIPTION = "Using entry_points in your setup.py makes scripts that start \ | ||
really slowly because it imports pkg_resources, which is a horrible \ | ||
thing to do if you want your trivial script to execute more or less \ | ||
instantly. fastentrypoints aims to fix that bypassing pkg_resources, \ | ||
making scripts load a lot faster." | ||
HOMEPAGE = "https://github.com/ninjaaron/fast-entry_points" | ||
SECTION = "devel/python" | ||
|
||
LICENSE = "BSD-2-Clause" | ||
LIC_FILES_CHKSUM = "file://README.rst;md5=f212a0cb34eb678477972d2011fb365a" | ||
|
||
inherit pypi setuptools3 | ||
|
||
RDEPENDS_${PN} += "${PYTHON_PN}-setuptools ${PYTHON_PN}-pickle" | ||
|
||
SRC_URI[md5sum] = "390ad9a9229164a06156a5b1f0ef1b22" | ||
SRC_URI[sha256sum] = "ff284f1469bd65400599807d2c6284d5b251398e6e28811f5f77fd262292410b" | ||
|
||
BBCLASSEXTEND = "native nativesdk" | ||
|