diff --git a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb index 319d49267cc..d90e6551e77 100644 --- a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb +++ b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb @@ -424,7 +424,6 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-tabulate \ python3-term \ python3-termcolor \ - python3-test-generator \ python3-textparser \ python3-texttable \ python3-thrift \ @@ -462,7 +461,6 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-websockets \ python3-werkzeug \ python3-werkzeug \ - python3-wheel \ python3-whoosh \ python3-wrapt \ python3-wtforms \ @@ -536,7 +534,6 @@ RDEPENDS:packagegroup-meta-python3-ptest = "\ python3-smpplib-ptest \ python3-soupsieve-ptest \ python3-sqlparse-ptest \ - python3-test-generator-ptest \ python3-typeguard-ptest \ python3-ujson-ptest \ python3-u-msgpack-python-ptest \ diff --git a/meta-python/recipes-devtools/python/python3-alembic_1.7.5.bb b/meta-python/recipes-devtools/python/python3-alembic_1.7.6.bb similarity index 66% rename from meta-python/recipes-devtools/python/python3-alembic_1.7.5.bb rename to meta-python/recipes-devtools/python/python3-alembic_1.7.6.bb index 131d5d43a01..822b3c02b8a 100644 --- a/meta-python/recipes-devtools/python/python3-alembic_1.7.5.bb +++ b/meta-python/recipes-devtools/python/python3-alembic_1.7.6.bb @@ -1,10 +1,10 @@ DESCRIPTION = "A database migration tool for SQLAlchemy" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c4ece55266dcdd02ce165b1ee0e490bb" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f5a8522010db1a393833988dbe2c7f0b" inherit pypi setuptools3 -SRC_URI[sha256sum] = "7c328694a2e68f03ee971e63c3bd885846470373a5b532cf2c9f1601c413b153" +SRC_URI[sha256sum] = "6c0c05e9768a896d804387e20b299880fe01bc56484246b0dffe8075d6d3d847" PYPI_PACKAGE = "alembic" diff --git a/meta-python/recipes-devtools/python/python3-autobahn_21.11.1.bb b/meta-python/recipes-devtools/python/python3-autobahn_22.1.1.bb similarity index 86% rename from meta-python/recipes-devtools/python/python3-autobahn_21.11.1.bb rename to meta-python/recipes-devtools/python/python3-autobahn_22.1.1.bb index 857862d31b0..f149b1221ef 100644 --- a/meta-python/recipes-devtools/python/python3-autobahn_21.11.1.bb +++ b/meta-python/recipes-devtools/python/python3-autobahn_22.1.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://crossbar.io/autobahn" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=97c0bda20ad1d845c6369c0e47a1cd98" -SRC_URI[sha256sum] = "bd6f46315419ca0a5be4109f737410208ad5f19718f67ca6a4a674cc66ca9b18" +SRC_URI[sha256sum] = "17e1b58b6ae1a63ca7d926b1d71bb9e4fd6b9ac9a1a2277d8ee40e0b61f54746" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-bitarray_2.3.6.bb b/meta-python/recipes-devtools/python/python3-bitarray_2.3.7.bb similarity index 77% rename from meta-python/recipes-devtools/python/python3-bitarray_2.3.6.bb rename to meta-python/recipes-devtools/python/python3-bitarray_2.3.7.bb index d4fb6ed76c3..cac003a4fbd 100644 --- a/meta-python/recipes-devtools/python/python3-bitarray_2.3.6.bb +++ b/meta-python/recipes-devtools/python/python3-bitarray_2.3.7.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/ilanschnell/bitarray" LICENSE = "PSF" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=2ad702cdcd49e8d2ac01d7e7d0810d2d" -SRC_URI[sha256sum] = "3bfdb59ded15c961e6e3d5b7f167155cda053be2475ea8017461df0b4d820b7d" +SRC_URI[sha256sum] = "4da790ab193e993107f3ff0aebc4f8d6ad5196a19071fbafad16b02898a44fd7" inherit setuptools3 pypi diff --git a/meta-python/recipes-devtools/python/python3-blinker/0001-use-pytest-instead-of-deprecated-nose.patch b/meta-python/recipes-devtools/python/python3-blinker/0001-use-pytest-instead-of-deprecated-nose.patch new file mode 100644 index 00000000000..a04c79b1e0e --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-blinker/0001-use-pytest-instead-of-deprecated-nose.patch @@ -0,0 +1,36 @@ +From 9750d01118ee59ab174525e30d987065b69c0538 Mon Sep 17 00:00:00 2001 +From: pgajdos +Date: Wed, 8 Jul 2020 15:22:19 +0200 +Subject: [PATCH] use pytest instead of deprecated nose + +Upstream-Status: Submitted [https://github.com/jek/blinker/pull/60] +Signed-off-by: Khem Raj +--- + tests/test_signals.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/test_signals.py b/tests/test_signals.py +index 9771e40..ccbc35b 100644 +--- a/tests/test_signals.py ++++ b/tests/test_signals.py +@@ -4,7 +4,7 @@ import time + + import blinker + +-from nose.tools import assert_raises ++import pytest + + + jython = sys.platform.startswith('java') +@@ -232,7 +232,7 @@ def test_meta_connect_failure(): + pass + sig = blinker.Signal() + +- assert_raises(TypeError, sig.connect, receiver) ++ pytest.raises(TypeError, sig.connect, receiver) + assert not sig.receivers + assert not sig._by_receiver + assert sig._by_sender == {blinker.base.ANY_ID: set()} +-- +2.35.1 + diff --git a/meta-python/recipes-devtools/python/python3-blinker_1.4.bb b/meta-python/recipes-devtools/python/python3-blinker_1.4.bb index 397fdcfb053..08a961f938b 100644 --- a/meta-python/recipes-devtools/python/python3-blinker_1.4.bb +++ b/meta-python/recipes-devtools/python/python3-blinker_1.4.bb @@ -8,12 +8,12 @@ SRC_URI[sha256sum] = "471aee25f3992bd325afa3772f1063dbdbbca947a041b8b89466dc00d6 inherit pypi setuptools3 ptest SRC_URI += " \ + file://0001-use-pytest-instead-of-deprecated-nose.patch \ file://run-ptest \ " RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-nose \ " do_install_ptest() { diff --git a/meta-python/recipes-devtools/python/python3-click_8.0.3.bb b/meta-python/recipes-devtools/python/python3-click_8.0.4.bb similarity index 92% rename from meta-python/recipes-devtools/python/python3-click_8.0.3.bb rename to meta-python/recipes-devtools/python/python3-click_8.0.4.bb index c31d0656730..76f7a8e6522 100644 --- a/meta-python/recipes-devtools/python/python3-click_8.0.3.bb +++ b/meta-python/recipes-devtools/python/python3-click_8.0.4.bb @@ -8,7 +8,7 @@ HOMEPAGE = "http://click.pocoo.org/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=1fa98232fd645608937a0fdc82e999b8" -SRC_URI[sha256sum] = "410e932b050f5eed773c4cda94de75971c89cdb3155a72a0831139a79e5ecb5b" +SRC_URI[sha256sum] = "8458d7b1287c5fb128c90e23381cf99dcde74beaf6c7ff6384ce84d6fe090adb" inherit pypi setuptools3 ptest diff --git a/meta-python/recipes-devtools/python/python3-cmd2_2.3.3.bb b/meta-python/recipes-devtools/python/python3-cmd2_2.4.0.bb similarity index 74% rename from meta-python/recipes-devtools/python/python3-cmd2_2.3.3.bb rename to meta-python/recipes-devtools/python/python3-cmd2_2.4.0.bb index d8a4fb5f23d..bc3fedd37e0 100644 --- a/meta-python/recipes-devtools/python/python3-cmd2_2.3.3.bb +++ b/meta-python/recipes-devtools/python/python3-cmd2_2.4.0.bb @@ -1,11 +1,11 @@ SUMMARY = "Extra features for standard library's cmd module" HOMEPAGE = "https://github.com/python-cmd2/cmd2" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4c527bcb481233ebcb803de975f42701" +LIC_FILES_CHKSUM = "file://LICENSE;md5=209e288518b0668115f58c3929af9ff1" DEPENDS += "${PYTHON_PN}-setuptools-scm-native" -SRC_URI[sha256sum] = "750d7eb04d55c3bc2a413e191bc177856f388102de47d11f2210a35266543640" +SRC_URI[sha256sum] = "090909ab6c8ecee40813cec759e61dd6e70c8227a1a8e96082f5f2b0d394bc77" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-coverage_6.3.bb b/meta-python/recipes-devtools/python/python3-coverage_6.3.2.bb similarity index 80% rename from meta-python/recipes-devtools/python/python3-coverage_6.3.bb rename to meta-python/recipes-devtools/python/python3-coverage_6.3.2.bb index 0ed90281f98..3c6b45705e6 100644 --- a/meta-python/recipes-devtools/python/python3-coverage_6.3.bb +++ b/meta-python/recipes-devtools/python/python3-coverage_6.3.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://coverage.readthedocs.io" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ee41112a44fe7014dce33e26468ba93" -SRC_URI[sha256sum] = "987a84ff98a309994ca77ed3cc4b92424f824278e48e4bf7d1bb79a63cfe2099" +SRC_URI[sha256sum] = "03e2a7826086b91ef345ff18742ee9fc47a6839ccd517061ef8fa1976e652ce9" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-distro_1.6.0.bb b/meta-python/recipes-devtools/python/python3-distro_1.7.0.bb similarity index 56% rename from meta-python/recipes-devtools/python/python3-distro_1.6.0.bb rename to meta-python/recipes-devtools/python/python3-distro_1.7.0.bb index 8aa22556700..f069234d1be 100644 --- a/meta-python/recipes-devtools/python/python3-distro_1.6.0.bb +++ b/meta-python/recipes-devtools/python/python3-distro_1.7.0.bb @@ -5,8 +5,15 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" PYPI_PACKAGE = "distro" -SRC_URI[sha256sum] = "83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424" +SRC_URI[sha256sum] = "151aeccf60c216402932b52e40ee477a939f8d58898927378a02abbe852c1c39" inherit pypi setuptools3 +RDEPENDS:${PN} = "\ + ${PYTHON_PN}-core \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-shell \ +" + BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-flask_2.0.2.bb b/meta-python/recipes-devtools/python/python3-flask_2.0.3.bb similarity index 87% rename from meta-python/recipes-devtools/python/python3-flask_2.0.2.bb rename to meta-python/recipes-devtools/python/python3-flask_2.0.3.bb index e3f1df35626..4070fc01280 100644 --- a/meta-python/recipes-devtools/python/python3-flask_2.0.2.bb +++ b/meta-python/recipes-devtools/python/python3-flask_2.0.3.bb @@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/mitsuhiko/flask/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=ffeffa59c90c9c4a033c7574f8f3fb75" -SRC_URI[sha256sum] = "7b2fb8e934ddd50731893bdcdb00fc8c0315916f9fcd50d22c7cc1a95ab634e2" +SRC_URI[sha256sum] = "e1120c228ca2f553b470df4a5fa927ab66258467526069981b3eb0a91902687d" PYPI_PACKAGE = "Flask" diff --git a/meta-python/recipes-devtools/python/python3-imageio_2.15.0.bb b/meta-python/recipes-devtools/python/python3-imageio_2.16.0.bb similarity index 81% rename from meta-python/recipes-devtools/python/python3-imageio_2.15.0.bb rename to meta-python/recipes-devtools/python/python3-imageio_2.16.0.bb index e3462ee44a2..04d5b9c95e8 100644 --- a/meta-python/recipes-devtools/python/python3-imageio_2.15.0.bb +++ b/meta-python/recipes-devtools/python/python3-imageio_2.16.0.bb @@ -5,7 +5,7 @@ SECTION = "devel/python" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=7b9bbbb543b6af3e6b53f9b7fb68f71d" -SRC_URI[sha256sum] = "d0d7abb4e5c4044c06fc573233489c4a25582698f93ca94f7bd70b6f4ab172ec" +SRC_URI[sha256sum] = "7f7d8d8e1eb6f8bb1d15e0dd93bee3f72026a4c3b96e9c690e42f403f7bdea3e" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-jdatetime_3.8.2.bb b/meta-python/recipes-devtools/python/python3-jdatetime_4.0.0.bb similarity index 79% rename from meta-python/recipes-devtools/python/python3-jdatetime_3.8.2.bb rename to meta-python/recipes-devtools/python/python3-jdatetime_4.0.0.bb index 67a6ea1f211..f76f2750365 100644 --- a/meta-python/recipes-devtools/python/python3-jdatetime_3.8.2.bb +++ b/meta-python/recipes-devtools/python/python3-jdatetime_4.0.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/slashmili/python-jalali" LICENSE = "Python-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=c80be45b33471b4a23cf53d06a8172be" -SRC_URI[sha256sum] = "c685687e3f39e1b9a3ba9c00ed9d8e88603bc8994413e84623e6c5d43214e6f8" +SRC_URI[sha256sum] = "d35baea2ed213e4e87bb840c61637001540bd21e8e4454bd12352b06591ec08e" PYPI_PACKAGE = "jdatetime" diff --git a/meta-python/recipes-devtools/python/python3-langtable_0.0.56.bb b/meta-python/recipes-devtools/python/python3-langtable_0.0.57.bb similarity index 86% rename from meta-python/recipes-devtools/python/python3-langtable_0.0.56.bb rename to meta-python/recipes-devtools/python/python3-langtable_0.0.57.bb index b8f052ea312..39819f43519 100644 --- a/meta-python/recipes-devtools/python/python3-langtable_0.0.56.bb +++ b/meta-python/recipes-devtools/python/python3-langtable_0.0.57.bb @@ -6,7 +6,7 @@ SECTION = "devel/python" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI[sha256sum] = "318af0fd616711ce5cd2a7b11a6761183ba9c1ff76a762919e08d85645fc854b" +SRC_URI[sha256sum] = "6c3c0a6577652c81871cbaf139046e1c88ead8439c585bd83976b3092f57e9d7" inherit pypi setuptools3 python3native diff --git a/meta-python/recipes-devtools/python/python3-oauthlib_3.2.0.bb b/meta-python/recipes-devtools/python/python3-oauthlib_3.2.0.bb index 3e5d957c4ee..e7f7f0b47bc 100644 --- a/meta-python/recipes-devtools/python/python3-oauthlib_3.2.0.bb +++ b/meta-python/recipes-devtools/python/python3-oauthlib_3.2.0.bb @@ -14,7 +14,7 @@ inherit pypi setuptools3 # # Uncomment this line to enable all the optional features. #PACKAGECONFIG ?= "test signedtoken signals rsa" -PACKAGECONFIG[test] = ",,,${PYTHON_PN}-blinker ${PYTHON_PN}-cryptography ${PYTHON_PN}-nose ${PYTHON_PN}-pyjwt" +PACKAGECONFIG[test] = ",,,${PYTHON_PN}-blinker ${PYTHON_PN}-cryptography ${PYTHON_PN}-pytest ${PYTHON_PN}-pyjwt" PACKAGECONFIG[signedtoken] = ",,,${PYTHON_PN}-cryptography ${PYTHON_PN}-pyjwt" PACKAGECONFIG[signals] = ",,,${PYTHON_PN}-blinker" PACKAGECONFIG[rsa] = ",,,${PYTHON_PN}-cryptography" diff --git a/meta-python/recipes-devtools/python/python3-ordered-set/run-ptest b/meta-python/recipes-devtools/python/python3-ordered-set/run-ptest index f7b9d0907c7..c27a6c3c574 100644 --- a/meta-python/recipes-devtools/python/python3-ordered-set/run-ptest +++ b/meta-python/recipes-devtools/python/python3-ordered-set/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest test.py +pytest test_ordered_set.py diff --git a/meta-python/recipes-devtools/python/python3-ordered-set_4.0.2.bb b/meta-python/recipes-devtools/python/python3-ordered-set_4.1.0.bb similarity index 57% rename from meta-python/recipes-devtools/python/python3-ordered-set_4.0.2.bb rename to meta-python/recipes-devtools/python/python3-ordered-set_4.1.0.bb index 323fe18fd1e..2740b335516 100644 --- a/meta-python/recipes-devtools/python/python3-ordered-set_4.0.2.bb +++ b/meta-python/recipes-devtools/python/python3-ordered-set_4.1.0.bb @@ -1,10 +1,9 @@ SUMMARY = "A MutableSet that remembers its order, so that every entry has an index." HOMEPAGE = "http://github.com/LuminosoInsight/ordered-set" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://MIT-LICENSE;md5=2b36be0d99854aa2ae292a800a7c1d4e" +LIC_FILES_CHKSUM = "file://MIT-LICENSE;md5=3bf5e1ad64c0d99032c3143361fa234e" -SRC_URI[md5sum] = "5d88f3870c32d4868b28c8fe833f7e74" -SRC_URI[sha256sum] = "ba93b2df055bca202116ec44b9bead3df33ea63a7d5827ff8e16738b97f33a95" +SRC_URI[sha256sum] = "694a8e44c87657c59292ede72891eb91d34131f6531463aab3009191c77364a8" inherit pypi setuptools3 ptest @@ -19,5 +18,5 @@ RDEPENDS:${PN}-ptest += " \ " do_install_ptest() { - cp -f ${S}/test.py ${D}${PTEST_PATH}/ + cp -f ${S}/test/test_ordered_set.py ${D}${PTEST_PATH}/ } diff --git a/meta-python/recipes-devtools/python/python3-pandas_1.4.0.bb b/meta-python/recipes-devtools/python/python3-pandas_1.4.1.bb similarity index 89% rename from meta-python/recipes-devtools/python/python3-pandas_1.4.0.bb rename to meta-python/recipes-devtools/python/python3-pandas_1.4.1.bb index 9b395440f96..4877194a5c4 100644 --- a/meta-python/recipes-devtools/python/python3-pandas_1.4.0.bb +++ b/meta-python/recipes-devtools/python/python3-pandas_1.4.1.bb @@ -6,7 +6,7 @@ HOMEPAGE = "http://pandas.pydata.org/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=3f23c5c092b74d245d48eeef72bc3fd2" -SRC_URI[sha256sum] = "cdd76254c7f0a1583bd4e4781fb450d0ebf392e10d3f12e92c95575942e37df5" +SRC_URI[sha256sum] = "8db93ec98ac7cb5f8ac1420c10f5e3c43533153f253fe7fb6d891cf5aa2b80d2" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-psutil/0001-fix-failure-test-cases.patch b/meta-python/recipes-devtools/python/python3-psutil/0001-fix-failure-test-cases.patch new file mode 100644 index 00000000000..34ea03b27f3 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-psutil/0001-fix-failure-test-cases.patch @@ -0,0 +1,197 @@ +From 8b4e38958ff8bdbb3ece4796bfa2d3b6f7536f71 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Wed, 23 Feb 2022 11:54:40 +0800 +Subject: [PATCH] fix failure test cases + +The test cases is not robust enough. skip some cases that is +not suitable for all conditions. + +* test_io_counters failed when kernel config CONFIG_TASKSTATS + and CONFIG_TASK_IO_ACCOUNTING are not enable in OE +* test_setup_script failed since oe don't install setup.py +* test_used failed since oe use git source for free, so the version + is 3.3.17-dirty +* test_weird_environ failed since gcc not installed +* test_debug failed since it is designed to run when PSUTIL_DEBUG is set +* test_against_findmnt/test_comparisons/test_disk_partitions_mocked/ + test_disk_partitions is not suitable for Linux nfs boot + +Upstream-Status: Pending + +Signed-off-by: Changqing Li +--- + psutil/tests/test_contracts.py | 1 + + psutil/tests/test_linux.py | 8 ++++++-- + psutil/tests/test_misc.py | 4 ++++ + psutil/tests/test_process.py | 5 +++++ + psutil/tests/test_system.py | 1 + + psutil/tests/test_unicode.py | 4 +++- + 6 files changed, 20 insertions(+), 3 deletions(-) + +diff --git a/psutil/tests/test_contracts.py b/psutil/tests/test_contracts.py +index 7401cc1..bf0fca0 100755 +--- a/psutil/tests/test_contracts.py ++++ b/psutil/tests/test_contracts.py +@@ -172,6 +172,7 @@ class TestAvailProcessAPIs(PsutilTestCase): + def test_rlimit(self): + self.assertEqual(hasattr(psutil.Process, "rlimit"), LINUX or FREEBSD) + ++ @unittest.skip("broken on OE since kernel config maye not be enabled") + def test_io_counters(self): + hasit = hasattr(psutil.Process, "io_counters") + self.assertEqual(hasit, False if MACOS or SUNOS else True) +diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py +index 20e28d2..66b6dda 100755 +--- a/psutil/tests/test_linux.py ++++ b/psutil/tests/test_linux.py +@@ -196,8 +196,9 @@ def get_free_version_info(): + out = sh(["free", "-V"]).strip() + if 'UNKNOWN' in out: + raise unittest.SkipTest("can't determine free version") +- return tuple(map(int, out.split()[-1].split('.'))) +- ++ vlist = out.split()[-1].split('.') ++ vlist[:] = [n.split('-')[0] for n in vlist] ++ return tuple(map(int, vlist)) + + @contextlib.contextmanager + def mock_open_content(for_path, content): +@@ -1289,6 +1290,7 @@ class TestRootFsDeviceFinder(PsutilTestCase): + finder.ask_sys_class_block() + + @unittest.skipIf(GITHUB_ACTIONS, "unsupported on GITHUB_ACTIONS") ++ @unittest.skip("Broken for oe") + def test_comparisons(self): + finder = RootFsDeviceFinder() + self.assertIsNotNone(finder.find()) +@@ -1311,11 +1313,13 @@ class TestRootFsDeviceFinder(PsutilTestCase): + + @unittest.skipIf(not which("findmnt"), "findmnt utility not available") + @unittest.skipIf(GITHUB_ACTIONS, "unsupported on GITHUB_ACTIONS") ++ @unittest.skip("Broken for oe") + def test_against_findmnt(self): + psutil_value = RootFsDeviceFinder().find() + findmnt_value = sh("findmnt -o SOURCE -rn /") + self.assertEqual(psutil_value, findmnt_value) + ++ @unittest.skip("Broken for oe") + def test_disk_partitions_mocked(self): + with mock.patch( + 'psutil._pslinux.cext.disk_partitions', +diff --git a/psutil/tests/test_misc.py b/psutil/tests/test_misc.py +index d946eb6..121004a 100755 +--- a/psutil/tests/test_misc.py ++++ b/psutil/tests/test_misc.py +@@ -54,6 +54,8 @@ from psutil.tests import unittest + # =================================================================== + + ++PSUTIL_DEBUG = bool(os.getenv('PSUTIL_DEBUG', 0)) ++ + class TestMisc(PsutilTestCase): + + def test_process__repr__(self, func=repr): +@@ -368,6 +370,7 @@ class TestMisc(PsutilTestCase): + + # XXX: https://github.com/pypa/setuptools/pull/2896 + @unittest.skipIf(APPVEYOR, "temporarily disabled due to setuptools bug") ++ @unittest.skip("OE run this test outof source tree") + def test_setup_script(self): + setup_py = os.path.join(ROOT_DIR, 'setup.py') + if CI_TESTING and not os.path.exists(setup_py): +@@ -401,6 +404,7 @@ class TestMisc(PsutilTestCase): + reload_module(psutil) + self.assertIn("version conflict", str(cm.exception).lower()) + ++ @unittest.skipIf(not PSUTIL_DEBUG, "env PSUTIL_DEBUG not set") + def test_debug(self): + if PY3: + from io import StringIO +diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py +index c9059e3..a34ba3d 100755 +--- a/psutil/tests/test_process.py ++++ b/psutil/tests/test_process.py +@@ -36,6 +36,7 @@ from psutil._compat import PY3 + from psutil._compat import FileNotFoundError + from psutil._compat import long + from psutil._compat import super ++from psutil._compat import which + from psutil.tests import APPVEYOR + from psutil.tests import CI_TESTING + from psutil.tests import GITHUB_ACTIONS +@@ -726,6 +727,7 @@ class TestProcess(PsutilTestCase): + self.assertEqual(' '.join(p.cmdline()), ' '.join(cmdline)) + + @unittest.skipIf(PYPY, "broken on PYPY") ++ @unittest.skipIf(not which("gcc"), "gcc not installed") + def test_long_cmdline(self): + testfn = self.get_testfn() + create_exe(testfn) +@@ -740,6 +742,7 @@ class TestProcess(PsutilTestCase): + assert pyexe.startswith(name), (pyexe, name) + + @unittest.skipIf(PYPY, "unreliable on PYPY") ++ @unittest.skipIf(not which("gcc"), "gcc not installed") + def test_long_name(self): + testfn = self.get_testfn(suffix="0123456789" * 2) + create_exe(testfn) +@@ -750,6 +753,7 @@ class TestProcess(PsutilTestCase): + @unittest.skipIf(SUNOS, "broken on SUNOS") + @unittest.skipIf(AIX, "broken on AIX") + @unittest.skipIf(PYPY, "broken on PYPY") ++ @unittest.skipIf(not which("gcc"), "gcc not installed") + def test_prog_w_funky_name(self): + # Test that name(), exe() and cmdline() correctly handle programs + # with funky chars such as spaces and ")", see: +@@ -1408,6 +1412,7 @@ class TestProcess(PsutilTestCase): + + @unittest.skipIf(not HAS_ENVIRON, "not supported") + @unittest.skipIf(not POSIX, "POSIX only") ++ @unittest.skipIf(not which("gcc"), "gcc not installed") + def test_weird_environ(self): + # environment variables can contain values without an equals sign + code = textwrap.dedent(""" +diff --git a/psutil/tests/test_system.py b/psutil/tests/test_system.py +index db2cb34..5ee519f 100755 +--- a/psutil/tests/test_system.py ++++ b/psutil/tests/test_system.py +@@ -580,6 +580,7 @@ class TestDiskAPIs(PsutilTestCase): + def test_disk_usage_bytes(self): + psutil.disk_usage(b'.') + ++ @unittest.skip("Broken for oe") + def test_disk_partitions(self): + def check_ntuple(nt): + self.assertIsInstance(nt.device, str) +diff --git a/psutil/tests/test_unicode.py b/psutil/tests/test_unicode.py +index e635726..7ba5b0f 100755 +--- a/psutil/tests/test_unicode.py ++++ b/psutil/tests/test_unicode.py +@@ -86,6 +86,7 @@ from psutil import POSIX + from psutil import WINDOWS + from psutil._compat import PY3 + from psutil._compat import u ++from psutil._compat import which + from psutil.tests import APPVEYOR + from psutil.tests import ASCII_FS + from psutil.tests import CI_TESTING +@@ -156,7 +157,7 @@ def try_unicode(suffix): + # FS APIs + # =================================================================== + +- ++@unittest.skipIf(not which("gcc"), "gcc not installed") + class BaseUnicodeTest(PsutilTestCase): + funky_suffix = None + +@@ -169,6 +170,7 @@ class BaseUnicodeTest(PsutilTestCase): + @serialrun + @unittest.skipIf(ASCII_FS, "ASCII fs") + @unittest.skipIf(PYPY and not PY3, "too much trouble on PYPY2") ++@unittest.skipIf(not which("gcc"), "gcc not installed") + class TestFSAPIs(BaseUnicodeTest): + """Test FS APIs with a funky, valid, UTF8 path name.""" + +-- +2.25.1 + diff --git a/meta-python/recipes-devtools/python/python3-psutil_5.9.0.bb b/meta-python/recipes-devtools/python/python3-psutil_5.9.0.bb index cf3e0b39c87..3df0e5d003e 100644 --- a/meta-python/recipes-devtools/python/python3-psutil_5.9.0.bb +++ b/meta-python/recipes-devtools/python/python3-psutil_5.9.0.bb @@ -6,6 +6,8 @@ SRC_URI[sha256sum] = "869842dbd66bb80c3217158e629d6fceaecc3a3166d3d1faee515b05dd inherit pypi setuptools3 +SRC_URI += "file://0001-fix-failure-test-cases.patch" + PACKAGES =+ "${PN}-tests" FILES:${PN}-tests += " \ diff --git a/meta-python/recipes-devtools/python/python3-test-generator/run-ptest b/meta-python/recipes-devtools/python/python3-test-generator/run-ptest deleted file mode 100644 index 5cec7116968..00000000000 --- a/meta-python/recipes-devtools/python/python3-test-generator/run-ptest +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -pytest diff --git a/meta-python/recipes-devtools/python/python3-test-generator_0.1.2.bb b/meta-python/recipes-devtools/python/python3-test-generator_0.1.2.bb deleted file mode 100644 index 7f212ddd87b..00000000000 --- a/meta-python/recipes-devtools/python/python3-test-generator_0.1.2.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Generator is a helper for generating test methods for nose while still using unittest." -DESCRIPTION = "Python package with modified subclasses of all stdlib XML \ -parsers that prevent any potentially malicious operation." - -LICENSE = "ISC" -LIC_FILES_CHKSUM = "file://LICENSE;md5=041a2bff595d40ccb4b36356f89dab00" - -SRC_URI += " \ - file://run-ptest \ -" - -SRC_URI[md5sum] = "6c69e73ba5b4b3ed62f7bcda071c64f1" -SRC_URI[sha256sum] = "ad5925c814bfe79497b43df096e3bb52c166d1577f7aff160137301676232f4a" - -inherit pypi setuptools3 ptest - -RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-mock \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} - -DEPENDS += "python3-nose-native" - -RDEPENDS:${PN} += "python3-six" diff --git a/meta-python/recipes-devtools/python/python3-unidiff_0.7.0.bb b/meta-python/recipes-devtools/python/python3-unidiff_0.7.3.bb similarity index 85% rename from meta-python/recipes-devtools/python/python3-unidiff_0.7.0.bb rename to meta-python/recipes-devtools/python/python3-unidiff_0.7.3.bb index b3013180d10..dd5b0c3eb03 100644 --- a/meta-python/recipes-devtools/python/python3-unidiff_0.7.0.bb +++ b/meta-python/recipes-devtools/python/python3-unidiff_0.7.3.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://github.com/matiasb/python-unidiff" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=4c434b08ef42fea235bb019b5e5a97b3" -SRC_URI[sha256sum] = "91bb13b4969514a400679d9ae5e29a6ffad85346087677f8b5e2e036af817447" +SRC_URI[sha256sum] = "d5f2e53a9a00db3224a8c36349b5380e0e22d1aec6c694b14fb9483ee93c6205" inherit pypi setuptools3 ptest diff --git a/meta-python/recipes-devtools/python/python3-wheel_0.37.1.bb b/meta-python/recipes-devtools/python/python3-wheel_0.37.1.bb deleted file mode 100644 index 6c7a31db9e7..00000000000 --- a/meta-python/recipes-devtools/python/python3-wheel_0.37.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "The official binary distribution format for Python " -HOMEPAGE = "https://github.com/pypa/wheel" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=10;endline=10;md5=8227180126797a0148f94f483f3e1489" - -SRC_URI[sha256sum] = "e9a504e793efbca1b8e0e9cb979a249cf4a0a7b5b8c9e8b65a5e39d49529c1c4" - -inherit pypi setuptools3 - -BBCLASSEXTEND = "native" -