Python 2 was end-of-lifed six years ago now, so I think it's time to
retire the six module from core and move it to meta-python.

A lot of recipes in meta-oe still claim to depend on it, but I expect
the majority of those are redundant.

Signed-off-by: Ross Burton <[email protected]>
---
 meta/conf/distro/include/maintainers.inc      |  1 -
 .../distro/include/ptest-packagelists.inc     |  1 -
 meta/recipes-devtools/python/python-six.inc   | 11 ---------
 .../python/python3-six_1.17.0.bb              | 23 -------------------
 4 files changed, 36 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python-six.inc
 delete mode 100644 meta/recipes-devtools/python/python3-six_1.17.0.bb

diff --git a/meta/conf/distro/include/maintainers.inc 
b/meta/conf/distro/include/maintainers.inc
index bded4bf6c7d..a41f2488089 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -723,7 +723,6 @@ RECIPE_MAINTAINER:pn-python3-setuptools = "Trevor Gamblin 
<[email protected]
 RECIPE_MAINTAINER:pn-python3-setuptools-rust = "Tim Orling 
<[email protected]>"
 RECIPE_MAINTAINER:pn-python3-setuptools-scm = "Trevor Gamblin 
<[email protected]>"
 RECIPE_MAINTAINER:pn-python3-shacl2code = "Benjamin Robin 
<[email protected]>"
-RECIPE_MAINTAINER:pn-python3-six = "Trevor Gamblin <[email protected]>"
 RECIPE_MAINTAINER:pn-python3-smartypants = "Trevor Gamblin 
<[email protected]>"
 RECIPE_MAINTAINER:pn-python3-smmap = "Trevor Gamblin <[email protected]>"
 RECIPE_MAINTAINER:pn-python3-snowballstemmer = "Tim Orling 
<[email protected]>"
diff --git a/meta/conf/distro/include/ptest-packagelists.inc 
b/meta/conf/distro/include/ptest-packagelists.inc
index 2b5d665abe7..4012be5f499 100644
--- a/meta/conf/distro/include/ptest-packagelists.inc
+++ b/meta/conf/distro/include/ptest-packagelists.inc
@@ -90,7 +90,6 @@ PTESTS_FAST = "\
     python3-pytz \
     python3-pyyaml \
     python3-rpds-py \
-    python3-six \
     python3-trove-classifiers \
     python3-vcs-versioning \
     python3-uritools \
diff --git a/meta/recipes-devtools/python/python-six.inc 
b/meta/recipes-devtools/python/python-six.inc
deleted file mode 100644
index f7a62b60688..00000000000
--- a/meta/recipes-devtools/python/python-six.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SUMMARY = "Python 2 and 3 compatibility library"
-HOMEPAGE = "https://pypi.org/project/six/";
-SECTION = "devel/python"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e50fab7e9501f3dfc920eafeb24b46ea"
-
-inherit pypi
-
-RDEPENDS:${PN} = "python3-io"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-devtools/python/python3-six_1.17.0.bb 
b/meta/recipes-devtools/python/python3-six_1.17.0.bb
deleted file mode 100644
index ca120e03086..00000000000
--- a/meta/recipes-devtools/python/python3-six_1.17.0.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-inherit setuptools3 ptest-python-pytest
-require python-six.inc
-
-SRC_URI[sha256sum] = 
"ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81"
-
-PTEST_PYTEST_DIR = "."
-
-# test_six.py exercises the six.moves mappings, which import these stdlib
-# modules that are packaged separately in oe-core.
-RDEPENDS:${PN}-ptest += " \
-    python3-html \
-    python3-netclient \
-    python3-xmlrpc \
-"
-
-do_install_ptest:append() {
-    # six ships its test at the sdist root; keep only test_six.py plus the
-    # generated run-ptest, and drop the packaged library sources / bytecode.
-    rm -f  ${D}${PTEST_PATH}/six.py
-    rm -f  ${D}${PTEST_PATH}/setup.py ${D}${PTEST_PATH}/setup.cfg 
${D}${PTEST_PATH}/MANIFEST.in
-    rm -f  ${D}${PTEST_PATH}/CHANGES ${D}${PTEST_PATH}/README.rst 
${D}${PTEST_PATH}/PKG-INFO ${D}${PTEST_PATH}/LICENSE
-    rm -rf ${D}${PTEST_PATH}/build ${D}${PTEST_PATH}/documentation 
${D}${PTEST_PATH}/six.egg-info ${D}${PTEST_PATH}/__pycache__
-}
-- 
2.43.0

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#245830): 
https://lists.openembedded.org/g/openembedded-core/message/245830
Mute This Topic: https://lists.openembedded.org/mt/121258217/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to