diff options
author | Tim Orling <ticotimo@gmail.com> | 2022-02-22 11:16:49 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-25 15:07:50 +0000 |
commit | db10509019fcfab46967d69e772fc3185e9042a3 (patch) | |
tree | ec694ae8314add4a676885f093576b122a27802a | |
parent | 7b4524f5a1f88378dd4a10d88bc07d90fdba1aac (diff) | |
download | poky-db10509019fcfab46967d69e772fc3185e9042a3.tar.gz |
python3-subunit: merge inc; set PIP_INSTALL_PACKAGE
We have not supported python2 for some time now, so there is no reason
to maintain a separate python-subunit.inc file.
The wheel built by bdist_wheel is named 'python_subunit-*.whl', so set
PIP_INSALL_PACKAGE appropriately.
Add patch to use vendored _distutils from setuptools.
[YOCTO #14638]
(From OE-Core rev: 1183357dc9ebff0281c195b41f16fa07c79e84a0)
Signed-off-by: Tim Orling <tim.orling@konsulko.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
4 files changed, 45 insertions, 17 deletions
diff --git a/meta/recipes-devtools/python/python-subunit.inc b/meta/recipes-devtools/python/python-subunit.inc deleted file mode 100644 index a2f9c5c3ff..0000000000 --- a/meta/recipes-devtools/python/python-subunit.inc +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | SUMMARY = "Python implementation of subunit test streaming protocol" | ||
2 | HOMEPAGE = "https://pypi.org/project/python-subunit/" | ||
3 | SECTION = "devel/python" | ||
4 | LICENSE = "Apache-2.0" | ||
5 | LIC_FILES_CHKSUM = "file://README.rst;beginline=1;endline=20;md5=909c08e291647fd985fbe5d9836d51b6" | ||
6 | |||
7 | PYPI_PACKAGE = "python-subunit" | ||
8 | |||
9 | SRC_URI[md5sum] = "30f1ab20651d94442dd9a7f8c9e8d633" | ||
10 | SRC_URI[sha256sum] = "042039928120fbf392e8c983d60f3d8ae1b88f90a9f8fd7188ddd9c26cad1e48" | ||
11 | |||
12 | inherit pypi | ||
13 | |||
14 | BBCLASSEXTEND = "nativesdk" | ||
diff --git a/meta/recipes-devtools/python/python3-strict-rfc3339/0001-setup.py-use-vendored-_distutils.patch b/meta/recipes-devtools/python/python3-strict-rfc3339/0001-setup.py-use-vendored-_distutils.patch new file mode 100644 index 0000000000..ba1c3d3363 --- /dev/null +++ b/meta/recipes-devtools/python/python3-strict-rfc3339/0001-setup.py-use-vendored-_distutils.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From 857719e82daea0d85b734cac34cf569050724068 Mon Sep 17 00:00:00 2001 | ||
2 | From: Tim Orling <tim.orling@konsulko.com> | ||
3 | Date: Sun, 20 Feb 2022 20:26:51 -0800 | ||
4 | Subject: [PATCH] setup.py: use vendored _distutils | ||
5 | |||
6 | Deprecation warning of distutils is interferring with bdist_wheel build. | ||
7 | |||
8 | For now, use the vendored setuptools._distutils.core. | ||
9 | |||
10 | Upstream-Status: Pending [upstream appears unmaintained] | ||
11 | |||
12 | Signed-off-by: Tim Orling <tim.orling@konsulko.com> | ||
13 | --- | ||
14 | setup.py | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/setup.py b/setup.py | ||
18 | index 1bf87cf..a49fb8e 100644 | ||
19 | --- a/setup.py | ||
20 | +++ b/setup.py | ||
21 | @@ -1,5 +1,5 @@ | ||
22 | import os.path | ||
23 | -from distutils.core import setup | ||
24 | +from setuptools._distutils.core import setup | ||
25 | |||
26 | readme_file = os.path.join(os.path.dirname(__file__), 'README.md') | ||
27 | readme = open(readme_file).read() | ||
diff --git a/meta/recipes-devtools/python/python3-strict-rfc3339_0.7.bb b/meta/recipes-devtools/python/python3-strict-rfc3339_0.7.bb index b8e929ef88..b592cb95d4 100644 --- a/meta/recipes-devtools/python/python3-strict-rfc3339_0.7.bb +++ b/meta/recipes-devtools/python/python3-strict-rfc3339_0.7.bb | |||
@@ -3,9 +3,11 @@ HOMEPAGE = "https://pypi.org/project/strict-rfc3339/" | |||
3 | LICENSE = "GPL-3.0-only" | 3 | LICENSE = "GPL-3.0-only" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=8f0e2cd40e05189ec81232da84bd6e1a" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=8f0e2cd40e05189ec81232da84bd6e1a" |
5 | 5 | ||
6 | SRC_URI[md5sum] = "4d9b635b4df885bc37bc1189d66c9abc" | 6 | SRC_URI += "file://0001-setup.py-use-vendored-_distutils.patch" |
7 | SRC_URI[sha256sum] = "5cad17bedfc3af57b399db0fed32771f18fc54bbd917e85546088607ac5e1277" | 7 | SRC_URI[sha256sum] = "5cad17bedfc3af57b399db0fed32771f18fc54bbd917e85546088607ac5e1277" |
8 | 8 | ||
9 | inherit pypi setuptools3 | 9 | inherit pypi setuptools3 |
10 | 10 | ||
11 | PIP_INSTALL_PACKAGE = "strict_rfc3339" | ||
12 | |||
11 | BBCLASSEXTEND = "native nativesdk" | 13 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta/recipes-devtools/python/python3-subunit_1.4.0.bb b/meta/recipes-devtools/python/python3-subunit_1.4.0.bb index a06ded868f..bc49a2b69e 100644 --- a/meta/recipes-devtools/python/python3-subunit_1.4.0.bb +++ b/meta/recipes-devtools/python/python3-subunit_1.4.0.bb | |||
@@ -1,4 +1,17 @@ | |||
1 | inherit setuptools3 | 1 | SUMMARY = "Python implementation of subunit test streaming protocol" |
2 | require python-subunit.inc | 2 | HOMEPAGE = "https://pypi.org/project/python-subunit/" |
3 | SECTION = "devel/python" | ||
4 | LICENSE = "Apache-2.0" | ||
5 | LIC_FILES_CHKSUM = "file://README.rst;beginline=1;endline=20;md5=909c08e291647fd985fbe5d9836d51b6" | ||
6 | |||
7 | PYPI_PACKAGE = "python-subunit" | ||
8 | |||
9 | SRC_URI[sha256sum] = "042039928120fbf392e8c983d60f3d8ae1b88f90a9f8fd7188ddd9c26cad1e48" | ||
10 | |||
11 | inherit pypi setuptools3 | ||
12 | |||
13 | PIP_INSTALL_PACKAGE = "python_subunit" | ||
3 | 14 | ||
4 | RDEPENDS:${PN} = " python3-testtools" | 15 | RDEPENDS:${PN} = " python3-testtools" |
16 | |||
17 | BBCLASSEXTEND = "nativesdk" | ||