[PATCH 00/14] Recipe upgrades from 02/01/2023 AUH

[PATCH 00/14] Recipe upgrades from 02/01/2023 AUH

[Tim Orling]

Fixed some upgrades that failed on AUH.
* python3-poetry-core
* python3-iniconfig
* python3-sphinxcontrib-applehelp
* python3-sphinxcontrib-htmlhelp

The following changes since commit 063bdffc04714c7ed4bdba2aa93a19dd94f256a9:

  perf: Fix 6.1 kernel reproducibility issue (2023-02-03 16:52:15 +0000)

are available in the Git repository at:

  https://git.yoctoproject.org/poky-contrib timo/recipe-upgrades
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=timo/recipe-upgrades

Tim Orling (14):
  libtest-needs-perl: upgrade 0.002009 -> 0.002010
  python3-pytest: upgrade 7.2.0 -> 7.2.1
  python3-hypothesis: upgrade 6.62.0 -> 6.66.0
  python3-poetry-core: upgrade 1.4.0 -> 1.5.0
  python3-iniconfig: upgrade 1.1.1 -> 2.0.0
  python3-pytz: upgrade 2022.7 -> 2022.7.1
  python3-zipp: upgrade 3.11.0 -> 3.12.0
  python3-requests: upgrade 2.28.1 -> 2.28.2
  python3-sphinxcontrib-applehelp: 1.0.3 -> 1.0.4
  python3-sphinxcontrib-htmlhelp: 2.0.0 -> 2.0.1
  python3-pyopenssl: upgrade 22.1.0 -> 23.0.0
  python3-wcwidth: upgrade 0.2.5 -> 0.2.6
  python3-urllib3: upgrade 1.26.13 -> 1.26.14
  python3-sphinx: upgrade 6.0.0 -> 6.1.3

 ...2009.bb => libtest-needs-perl_0.002010.bb} |  3 +--
 ...6.62.0.bb => python3-hypothesis_6.66.0.bb} |  2 +-
 ...ig_1.1.1.bb => python3-iniconfig_2.0.0.bb} |  7 +++--
 .../python3-poetry-core/deterministic.patch   | 23 ----------------
 ..._1.4.0.bb => python3-poetry-core_1.5.0.bb} |  5 +---
 ..._22.1.0.bb => python3-pyopenssl_23.0.0.bb} |  2 +-
 ...ytest_7.2.0.bb => python3-pytest_7.2.1.bb} |  2 +-
 ...ytz_2022.7.bb => python3-pytz_2022.7.1.bb} |  2 +-
 ...s_2.28.1.bb => python3-requests_2.28.2.bb} |  2 +-
 ...phinx_6.0.0.bb => python3-sphinx_6.1.3.bb} | 26 +++++++++++++++++--
 ... python3-sphinxcontrib-applehelp_1.0.4.bb} |  6 ++---
 ...> python3-sphinxcontrib-htmlhelp_2.0.1.bb} |  4 +--
 ..._1.26.13.bb => python3-urllib3_1.26.14.bb} |  2 +-
 ...idth_0.2.5.bb => python3-wcwidth_0.2.6.bb} |  3 +--
 ...-zipp_3.11.0.bb => python3-zipp_3.12.0.bb} |  2 +-
 15 files changed, 41 insertions(+), 50 deletions(-)
 rename meta/recipes-devtools/perl/{libtest-needs-perl_0.002009.bb => libtest-needs-perl_0.002010.bb} (86%)
 rename meta/recipes-devtools/python/{python3-hypothesis_6.62.0.bb => python3-hypothesis_6.66.0.bb} (91%)
 rename meta/recipes-devtools/python/{python3-iniconfig_1.1.1.bb => python3-iniconfig_2.0.0.bb} (46%)
 delete mode 100644 meta/recipes-devtools/python/python3-poetry-core/deterministic.patch
 rename meta/recipes-devtools/python/{python3-poetry-core_1.4.0.bb => python3-poetry-core_1.5.0.bb} (89%)
 rename meta/recipes-devtools/python/{python3-pyopenssl_22.1.0.bb => python3-pyopenssl_23.0.0.bb} (86%)
 rename meta/recipes-devtools/python/{python3-pytest_7.2.0.bb => python3-pytest_7.2.1.bb} (93%)
 rename meta/recipes-devtools/python/{python3-pytz_2022.7.bb => python3-pytz_2022.7.1.bb} (89%)
 rename meta/recipes-devtools/python/{python3-requests_2.28.1.bb => python3-requests_2.28.2.bb} (87%)
 rename meta/recipes-devtools/python/{python3-sphinx_6.0.0.bb => python3-sphinx_6.1.3.bb} (49%)
 rename meta/recipes-devtools/python/{python3-sphinxcontrib-applehelp_1.0.3.bb => python3-sphinxcontrib-applehelp_1.0.4.bb} (62%)
 rename meta/recipes-devtools/python/{python3-sphinxcontrib-htmlhelp_2.0.0.bb => python3-sphinxcontrib-htmlhelp_2.0.1.bb} (70%)
 rename meta/recipes-devtools/python/{python3-urllib3_1.26.13.bb => python3-urllib3_1.26.14.bb} (86%)
 rename meta/recipes-devtools/python/{python3-wcwidth_0.2.5.bb => python3-wcwidth_0.2.6.bb} (80%)
 rename meta/recipes-devtools/python/{python3-zipp_3.11.0.bb => python3-zipp_3.12.0.bb} (85%)

-- 
2.30.2

[PATCH 01/14] libtest-needs-perl: upgrade 0.002009 -> 0.002010

[Tim Orling]

0.002010 - 2023-01-22
  - split main test into three separate scripts
  - avoid outputting multiple plans if used with no_plan

Signed-off-by: Tim Orling <tim.orling@konsulko.com>
---
 ...t-needs-perl_0.002009.bb => libtest-needs-perl_0.002010.bb} | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename meta/recipes-devtools/perl/{libtest-needs-perl_0.002009.bb => libtest-needs-perl_0.002010.bb} (86%)

diff --git a/meta/recipes-devtools/perl/libtest-needs-perl_0.002009.bb b/meta/recipes-devtools/perl/libtest-needs-perl_0.002010.bb
similarity index 86%
rename from meta/recipes-devtools/perl/libtest-needs-perl_0.002009.bb
rename to meta/recipes-devtools/perl/libtest-needs-perl_0.002010.bb
index 43a9a6b7d32..79a06170e02 100644
--- a/meta/recipes-devtools/perl/libtest-needs-perl_0.002009.bb
+++ b/meta/recipes-devtools/perl/libtest-needs-perl_0.002010.bb
@@ -17,8 +17,7 @@ DEPENDS += "perl"
 
 SRC_URI = "https://cpan.metacpan.org/authors/id/H/HA/${CPAN_AUTHOR}/${CPAN_NAME}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "5643cd323afb77d20363acbaf9b12bcc"
-SRC_URI[sha256sum] = "571c21193ad16195df58b06b268798796a391b398c443271721d2cc0fb7c4ac3"
+SRC_URI[sha256sum] = "923ffdc78fcba96609753e4bae26b0ba0186893de4a63cd5236e012c7c90e208"
 
 S = "${WORKDIR}/${CPAN_NAME}-${PV}"
 
-- 
2.30.2

[PATCH 02/14] python3-pytest: upgrade 7.2.0 -> 7.2.1

[Tim Orling]

https://docs.pytest.org/en/stable/changelog.html#pytest-7-2-1-2023-01-13

pytest 7.2.1 (2023-01-13)

Bug Fixes
    #10452: Fix ‘importlib.abc.TraversableResources’ deprecation warning in
            Python 3.12.
    #10457: If a test is skipped from inside a fixture, the test summary now
            shows the test location instead of the fixture location.
    #10506: Fix bug where sometimes pytest would use the file system root
            directory as rootdir on Windows.
    #10607: Fix a race condition when creating junitxml reports, which could
            occur when multiple instances of pytest execute in parallel.
    #10641: Fix a race condition when creating or updating the stepwise
            plugin’s cache, which could occur when multiple xdist worker
            nodes try to simultaneously update the stepwise plugin’s cache.

Signed-off-by: Tim Orling <tim.orling@konsulko.com>
---
 .../python/{python3-pytest_7.2.0.bb => python3-pytest_7.2.1.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-pytest_7.2.0.bb => python3-pytest_7.2.1.bb} (93%)

diff --git a/meta/recipes-devtools/python/python3-pytest_7.2.0.bb b/meta/recipes-devtools/python/python3-pytest_7.2.1.bb
similarity index 93%
rename from meta/recipes-devtools/python/python3-pytest_7.2.0.bb
rename to meta/recipes-devtools/python/python3-pytest_7.2.1.bb
index 02fc55fdb0b..85fc507dde9 100644
--- a/meta/recipes-devtools/python/python3-pytest_7.2.0.bb
+++ b/meta/recipes-devtools/python/python3-pytest_7.2.1.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "The pytest framework makes it easy to write small tests, yet scal
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=bd27e41b6550fe0fc45356d1d81ee37c"
 
-SRC_URI[sha256sum] = "c4014eb40e10f11f355ad4e3c2fb2c6c6d1919c73f3b5a433de4708202cade59"
+SRC_URI[sha256sum] = "d45e0952f3727241918b8fd0f376f5ff6b301cc0777c6f9a556935c92d8a7d42"
 
 DEPENDS += "python3-setuptools-scm-native"
 
-- 
2.30.2

[PATCH 03/14] python3-hypothesis: upgrade 6.62.0 -> 6.66.0

[Tim Orling]

https://hypothesis.readthedocs.io/en/latest/changes.html#v6-66-0
https://hypothesis.readthedocs.io/en/latest/changes.html#v6-65-2
https://hypothesis.readthedocs.io/en/latest/changes.html#v6-65-1
https://hypothesis.readthedocs.io/en/latest/changes.html#v6-65-0
https://hypothesis.readthedocs.io/en/latest/changes.html#v6-64-0
https://hypothesis.readthedocs.io/en/latest/changes.html#v6-63-0
https://hypothesis.readthedocs.io/en/latest/changes.html#v6-62-1

Signed-off-by: Tim Orling <tim.orling@konsulko.com>
---
 ...ython3-hypothesis_6.62.0.bb => python3-hypothesis_6.66.0.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-hypothesis_6.62.0.bb => python3-hypothesis_6.66.0.bb} (91%)

diff --git a/meta/recipes-devtools/python/python3-hypothesis_6.62.0.bb b/meta/recipes-devtools/python/python3-hypothesis_6.66.0.bb
similarity index 91%
rename from meta/recipes-devtools/python/python3-hypothesis_6.62.0.bb
rename to meta/recipes-devtools/python/python3-hypothesis_6.66.0.bb
index 4369a697bd9..3101845e48c 100644
--- a/meta/recipes-devtools/python/python3-hypothesis_6.62.0.bb
+++ b/meta/recipes-devtools/python/python3-hypothesis_6.66.0.bb
@@ -13,7 +13,7 @@ SRC_URI += " \
     file://test_rle.py \
     "
 
-SRC_URI[sha256sum] = "76f1141e8237f6dd0780a171bec5d6aec873208ccc27b5f9753d4cccd8904272"
+SRC_URI[sha256sum] = "2fb334ab068dc6e7c02d49a1c694f66bd1f681197eeed94406650a59eebef870"
 
 RDEPENDS:${PN} += " \
     python3-attrs \
-- 
2.30.2

[PATCH 04/14] python3-poetry-core: upgrade 1.4.0 -> 1.5.0

[Tim Orling]

* Drop deterministic.patch; merged https://github.com/python-poetry/poetry-core/pull/545
* Drop vendored pyparsing LICENSE; no longer vendored

https://github.com/python-poetry/poetry-core/blob/main/CHANGELOG.md#150---2023-01-27

Signed-off-by: Tim Orling <tim.orling@konsulko.com>
---
 .../python3-poetry-core/deterministic.patch   | 23 -------------------
 ..._1.4.0.bb => python3-poetry-core_1.5.0.bb} |  5 +---
 2 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python3-poetry-core/deterministic.patch
 rename meta/recipes-devtools/python/{python3-poetry-core_1.4.0.bb => python3-poetry-core_1.5.0.bb} (89%)

diff --git a/meta/recipes-devtools/python/python3-poetry-core/deterministic.patch b/meta/recipes-devtools/python/python3-poetry-core/deterministic.patch
deleted file mode 100644
index 402ee530944..00000000000
--- a/meta/recipes-devtools/python/python3-poetry-core/deterministic.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-builders/wheel: Ensure dist-info is written determinisically
-
-glob() returns values in "on disk" order. To make the RECORD file
-deterministic and consistent between builds we need to sort the
-data before adding to the records list.
-
-Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-
-Upstream-Status: Submitted [https://github.com/python-poetry/poetry-core/pull/545]
-
-Index: builders/wheel.py
-===================================================================
---- a/src/poetry/core/masonry/builders/wheel.py
-+++ b/src/poetry/core/masonry/builders/wheel.py
-@@ -294,7 +294,7 @@ class WheelBuilder(Builder):
- 
-     def _copy_dist_info(self, wheel: zipfile.ZipFile, source: Path) -> None:
-         dist_info = Path(self.dist_info)
--        for file in source.glob("**/*"):
-+        for file in sorted(source.glob("**/*") ):
-             if not file.is_file():
-                 continue
- 
diff --git a/meta/recipes-devtools/python/python3-poetry-core_1.4.0.bb b/meta/recipes-devtools/python/python3-poetry-core_1.5.0.bb
similarity index 89%
rename from meta/recipes-devtools/python/python3-poetry-core_1.4.0.bb
rename to meta/recipes-devtools/python/python3-poetry-core_1.5.0.bb
index 8a950220125..03db426b39a 100644
--- a/meta/recipes-devtools/python/python3-poetry-core_1.4.0.bb
+++ b/meta/recipes-devtools/python/python3-poetry-core_1.5.0.bb
@@ -14,20 +14,17 @@ LIC_FILES_CHKSUM = "\
     file://src/poetry/core/_vendor/packaging/LICENSE;md5=faadaedca9251a90b205c9167578ce91 \
     file://src/poetry/core/_vendor/packaging/LICENSE.APACHE;md5=2ee41112a44fe7014dce33e26468ba93 \
     file://src/poetry/core/_vendor/packaging/LICENSE.BSD;md5=7bef9bf4a8e4263634d0597e7ba100b8 \
-    file://src/poetry/core/_vendor/pyparsing/LICENSE;md5=657a566233888513e1f07ba13e2f47f1 \
     file://src/poetry/core/_vendor/pyrsistent/LICENSE.mit;md5=b695eb9c6e7a6fb1b1bc2d193c42776e \
     file://src/poetry/core/_vendor/tomlkit/LICENSE;md5=31aac0dbc1babd278d5386dadb7f8e82 \
     file://src/poetry/core/_vendor/typing_extensions.LICENSE;md5=f16b323917992e0f8a6f0071bc9913e2 \
 "
 
-SRC_URI[sha256sum] = "514bd33c30e0bf56b0ed44ee15e120d7e47b61ad908b2b1011da68c48a84ada9"
+SRC_URI[sha256sum] = "253521bb7104e1df81f64d7b49ea1825057c91fa156d7d0bd752fefdad6f8c7a"
 
 inherit python_poetry_core pypi
 PYPI_ARCHIVE_NAME = "poetry_core-${PV}.${PYPI_PACKAGE_EXT}"
 S = "${WORKDIR}/poetry_core-${PV}"
 
-SRC_URI += "file://deterministic.patch"
-
 RDEPENDS:${PN}:append:class-target = "\
     python3-compression \
     python3-core \
-- 
2.30.2

[PATCH 05/14] python3-iniconfig: upgrade 1.1.1 -> 2.0.0

[Tim Orling]

* Switch to hatchling build-backend
* inherit python_hatchling instead of python_setuptools_build_meta
* DEPENDS on python3-hatch-vcs-native instead of python3-setuptools-scm-native

2.0.0
======

* add support for Python 3.7-3.11
* drop support for Python 2.6-3.6
* add encoding argument defaulting to utf-8
* inline and clarify type annotations
* move parsing code from inline to extra file
* add typing overloads for helper methods

.. note::

  major release due to the major changes in python versions supported
  + changes in packaging the api is expected to be compatible

Signed-off-by: Tim Orling <tim.orling@konsulko.com>
---
 ...thon3-iniconfig_1.1.1.bb => python3-iniconfig_2.0.0.bb} | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
 rename meta/recipes-devtools/python/{python3-iniconfig_1.1.1.bb => python3-iniconfig_2.0.0.bb} (46%)

diff --git a/meta/recipes-devtools/python/python3-iniconfig_1.1.1.bb b/meta/recipes-devtools/python/python3-iniconfig_2.0.0.bb
similarity index 46%
rename from meta/recipes-devtools/python/python3-iniconfig_1.1.1.bb
rename to meta/recipes-devtools/python/python3-iniconfig_2.0.0.bb
index 4643437b800..ca50ebbc352 100644
--- a/meta/recipes-devtools/python/python3-iniconfig_1.1.1.bb
+++ b/meta/recipes-devtools/python/python3-iniconfig_2.0.0.bb
@@ -4,9 +4,8 @@ HOMEPAGE = "https://pypi.org/project/iniconfig/"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=a6bb0320b04a0a503f12f69fea479de9"
 
-SRC_URI[md5sum] = "0b7f3be87481211c183eae095bcea6f1"
-SRC_URI[sha256sum] = "bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"
+SRC_URI[sha256sum] = "2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3"
 
-DEPENDS += "python3-setuptools-scm-native"
+DEPENDS += "python3-hatch-vcs-native"
 
-inherit pypi python_setuptools_build_meta
+inherit pypi python_hatchling
-- 
2.30.2

[PATCH 06/14] python3-pytz: upgrade 2022.7 -> 2022.7.1

[Tim Orling]

https://github.com/stub42/pytz/commits/release_2022.7.1

Signed-off-by: Tim Orling <tim.orling@konsulko.com>
---
 .../python/{python3-pytz_2022.7.bb => python3-pytz_2022.7.1.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-pytz_2022.7.bb => python3-pytz_2022.7.1.bb} (89%)

diff --git a/meta/recipes-devtools/python/python3-pytz_2022.7.bb b/meta/recipes-devtools/python/python3-pytz_2022.7.1.bb
similarity index 89%
rename from meta/recipes-devtools/python/python3-pytz_2022.7.bb
rename to meta/recipes-devtools/python/python3-pytz_2022.7.1.bb
index a6a69c8b596..553b9cfa181 100644
--- a/meta/recipes-devtools/python/python3-pytz_2022.7.bb
+++ b/meta/recipes-devtools/python/python3-pytz_2022.7.1.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1a67fc46c1b596cce5d21209bbe75999"
 
 inherit pypi setuptools3 ptest
 
-SRC_URI[sha256sum] = "7ccfae7b4b2c067464a6733c6261673fdb8fd1be905460396b97a073e9fa683a"
+SRC_URI[sha256sum] = "01a0681c4b9684a28304615eba55d1ab31ae00bf68ec157ec3708a8182dbbcd0"
 
 RDEPENDS:${PN}:class-target += "\
     ${PYTHON_PN}-datetime \
-- 
2.30.2

[PATCH 07/14] python3-zipp: upgrade 3.11.0 -> 3.12.0

[Tim Orling]

https://github.com/jaraco/zipp/blob/main/CHANGES.rst#v3120

v3.12.0
    gh-101144: Honor encoding as positional parameter to Path.open() and
               Path.read_text().

Signed-off-by: Tim Orling <tim.orling@konsulko.com>
---
 .../python/{python3-zipp_3.11.0.bb => python3-zipp_3.12.0.bb}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-zipp_3.11.0.bb => python3-zipp_3.12.0.bb} (85%)

diff --git a/meta/recipes-devtools/python/python3-zipp_3.11.0.bb b/meta/recipes-devtools/python/python3-zipp_3.12.0.bb
similarity index 85%
rename from meta/recipes-devtools/python/python3-zipp_3.11.0.bb
rename to meta/recipes-devtools/python/python3-zipp_3.12.0.bb
index 70ebafc1689..1b36e425436 100644
--- a/meta/recipes-devtools/python/python3-zipp_3.11.0.bb
+++ b/meta/recipes-devtools/python/python3-zipp_3.12.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/jaraco/zipp"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7a7126e068206290f3fe9f8d6c713ea6"
 
-SRC_URI[sha256sum] = "a7a22e05929290a67401440b39690ae6563279bced5f314609d9d03798f56766"
+SRC_URI[sha256sum] = "73efd63936398aac78fd92b6f4865190119d6c91b531532e798977ea8dd402eb"
 
 DEPENDS += "${PYTHON_PN}-setuptools-scm-native"
 
-- 
2.30.2

[PATCH 08/14] python3-requests: upgrade 2.28.1 -> 2.28.2

[Tim Orling]

https://requests.readthedocs.io/en/latest/community/updates/#release-history

2.28.2 (2023-01-12)

Dependencies
    Requests now supports charset_normalizer 3.x. (#6261)

Bugfixes
    Updated MissingSchema exception to suggest https scheme rather than
    http. (#6188)

Signed-off-by: Tim Orling <tim.orling@konsulko.com>
---
 .../{python3-requests_2.28.1.bb => python3-requests_2.28.2.bb}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-requests_2.28.1.bb => python3-requests_2.28.2.bb} (87%)

diff --git a/meta/recipes-devtools/python/python3-requests_2.28.1.bb b/meta/recipes-devtools/python/python3-requests_2.28.2.bb
similarity index 87%
rename from meta/recipes-devtools/python/python3-requests_2.28.1.bb
rename to meta/recipes-devtools/python/python3-requests_2.28.2.bb
index 8de08d26200..2f397ddaadf 100644
--- a/meta/recipes-devtools/python/python3-requests_2.28.1.bb
+++ b/meta/recipes-devtools/python/python3-requests_2.28.2.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://python-requests.org"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
 
-SRC_URI[sha256sum] = "7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983"
+SRC_URI[sha256sum] = "98b1b2782e3c6c4904938b84c0eb932721069dfdb9134313beff7c83c2df24bf"
 
 inherit pypi setuptools3
 
-- 
2.30.2

[PATCH 09/14] python3-sphinxcontrib-applehelp: 1.0.3 -> 1.0.4

[Tim Orling]

* Tarball name changed so we can drop custom PYPI_PACKAGE
* Switched back from flit to setuptools
* inherit python_setuptools_build_meta instead of python3_flit_core

https://github.com/sphinx-doc/sphinxcontrib-applehelp/commits/1.0.4

Signed-off-by: Tim Orling <tim.orling@konsulko.com>
---
 ...lp_1.0.3.bb => python3-sphinxcontrib-applehelp_1.0.4.bb} | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
 rename meta/recipes-devtools/python/{python3-sphinxcontrib-applehelp_1.0.3.bb => python3-sphinxcontrib-applehelp_1.0.4.bb} (62%)

diff --git a/meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.3.bb b/meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.4.bb
similarity index 62%
rename from meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.3.bb
rename to meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.4.bb
index c97d204c068..4d14216c524 100644
--- a/meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.3.bb
+++ b/meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.4.bb
@@ -3,10 +3,8 @@ HOMEPAGE = "https://www.sphinx-doc.org"
 LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c7715857042d4c8c0105999ca0c072c5"
 
-SRC_URI[sha256sum] = "83749f09f6ac843b8cb685277dbc818a8bf2d76cc19602699094fe9a74db529e"
+SRC_URI[sha256sum] = "828f867945bbe39817c210a1abfd1bc4895c8b73fcaade56d45357a348a07d7e"
 
-PYPI_PACKAGE = "sphinxcontrib.applehelp"
-
-inherit pypi python_flit_core
+inherit pypi python_setuptools_build_meta
 
 BBCLASSEXTEND = "native nativesdk"
-- 
2.30.2

[PATCH 10/14] python3-sphinxcontrib-htmlhelp: 2.0.0 -> 2.0.1

[Tim Orling]

* inherit python_setuptools_build_meta

https://github.com/sphinx-doc/sphinxcontrib-htmlhelp/blob/master/CHANGES

Release 2.0.1 (2023-01-31)
==========================

* Drop support for Python 3.7 and lower
* Fix deprecation warnings from Sphinx 6.1

Signed-off-by: Tim Orling <tim.orling@konsulko.com>
---
 ...lhelp_2.0.0.bb => python3-sphinxcontrib-htmlhelp_2.0.1.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/python/{python3-sphinxcontrib-htmlhelp_2.0.0.bb => python3-sphinxcontrib-htmlhelp_2.0.1.bb} (70%)

diff --git a/meta/recipes-devtools/python/python3-sphinxcontrib-htmlhelp_2.0.0.bb b/meta/recipes-devtools/python/python3-sphinxcontrib-htmlhelp_2.0.1.bb
similarity index 70%
rename from meta/recipes-devtools/python/python3-sphinxcontrib-htmlhelp_2.0.0.bb
rename to meta/recipes-devtools/python/python3-sphinxcontrib-htmlhelp_2.0.1.bb
index cd8b987e0c8..39589881daa 100644
--- a/meta/recipes-devtools/python/python3-sphinxcontrib-htmlhelp_2.0.0.bb
+++ b/meta/recipes-devtools/python/python3-sphinxcontrib-htmlhelp_2.0.1.bb
@@ -3,10 +3,10 @@ HOMEPAGE = "https://www.sphinx-doc.org"
 LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=24dce5ef6a13563241c24bc366f48886"
 
-SRC_URI[sha256sum] = "f5f8bb2d0d629f398bf47d0d69c07bc13b65f75a81ad9e2f71a63d4b7a2f6db2"
+SRC_URI[sha256sum] = "0cbdd302815330058422b98a113195c9249825d681e18f11e8b1f78a2f11efff"
 
 PYPI_PACKAGE = "sphinxcontrib-htmlhelp"
 
-inherit pypi setuptools3
+inherit pypi python_setuptools_build_meta
 
 BBCLASSEXTEND = "native nativesdk"
-- 
2.30.2

[PATCH 11/14] python3-pyopenssl: upgrade 22.1.0 -> 23.0.0

[Tim Orling]

https://www.pyopenssl.org/en/23.0.0/changelog.html

23.0.0 (2023-01-01)

Changes:
    Add OpenSSL.SSL.X509StoreFlags.PARTIAL_CHAIN constant to allow for users
    to perform certificate verification on partial certificate chains. #1166

    cryptography maximum version has been increased to 39.0.x.

Signed-off-by: Tim Orling <tim.orling@konsulko.com>
---
 ...{python3-pyopenssl_22.1.0.bb => python3-pyopenssl_23.0.0.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-pyopenssl_22.1.0.bb => python3-pyopenssl_23.0.0.bb} (86%)

diff --git a/meta/recipes-devtools/python/python3-pyopenssl_22.1.0.bb b/meta/recipes-devtools/python/python3-pyopenssl_23.0.0.bb
similarity index 86%
rename from meta/recipes-devtools/python/python3-pyopenssl_22.1.0.bb
rename to meta/recipes-devtools/python/python3-pyopenssl_23.0.0.bb
index 4d83b8c7d74..822d21a58a7 100644
--- a/meta/recipes-devtools/python/python3-pyopenssl_22.1.0.bb
+++ b/meta/recipes-devtools/python/python3-pyopenssl_23.0.0.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 DEPENDS += "openssl ${PYTHON_PN}-cryptography"
 
-SRC_URI[sha256sum] = "7a83b7b272dd595222d672f5ce29aa030f1fb837630ef229f62e72e395ce8968"
+SRC_URI[sha256sum] = "c1cc5f86bcacefc84dada7d31175cae1b1518d5f60d3d0bb595a67822a868a6f"
 
 PYPI_PACKAGE = "pyOpenSSL"
 inherit pypi setuptools3
-- 
2.30.2

[PATCH 12/14] python3-wcwidth: upgrade 0.2.5 -> 0.2.6

[Tim Orling]

https://github.com/jquast/wcwidth#history

0.2.6 2023-01-14
  * Updated tables to include Unicode Specification 14.0.0 and 15.0.0.
  * Changed developer tools to use pip-compile, and to use jinja2
    templates for code generation in bin/update-tables.py to prepare
    for possible compiler optimization release.

Signed-off-by: Tim Orling <tim.orling@konsulko.com>
---
 .../{python3-wcwidth_0.2.5.bb => python3-wcwidth_0.2.6.bb}     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename meta/recipes-devtools/python/{python3-wcwidth_0.2.5.bb => python3-wcwidth_0.2.6.bb} (80%)

diff --git a/meta/recipes-devtools/python/python3-wcwidth_0.2.5.bb b/meta/recipes-devtools/python/python3-wcwidth_0.2.6.bb
similarity index 80%
rename from meta/recipes-devtools/python/python3-wcwidth_0.2.5.bb
rename to meta/recipes-devtools/python/python3-wcwidth_0.2.6.bb
index a532d3c5cb9..368146dba48 100644
--- a/meta/recipes-devtools/python/python3-wcwidth_0.2.5.bb
+++ b/meta/recipes-devtools/python/python3-wcwidth_0.2.6.bb
@@ -4,8 +4,7 @@ HOMEPAGE = "https://github.com/jquast/wcwidth"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b15979c39a2543892fca8cd86b4b52cb"
 
-SRC_URI[md5sum] = "a07a75f99d316e14838ac760c831ea37"
-SRC_URI[sha256sum] = "c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83"
+SRC_URI[sha256sum] = "a5220780a404dbe3353789870978e472cfe477761f06ee55077256e509b156d0"
 
 inherit pypi setuptools3 ptest
 
-- 
2.30.2

[PATCH 13/14] python3-urllib3: upgrade 1.26.13 -> 1.26.14

[Tim Orling]

https://github.com/urllib3/urllib3/blob/1.26.14/CHANGES.rst#12614-2023-01-11

1.26.14 (2023-01-11)
    Fixed parsing of port 0 (zero) returning None, instead of 0. (#2850)
    Removed deprecated getheaders() calls in contrib module.

Signed-off-by: Tim Orling <tim.orling@konsulko.com>
---
 .../{python3-urllib3_1.26.13.bb => python3-urllib3_1.26.14.bb}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-urllib3_1.26.13.bb => python3-urllib3_1.26.14.bb} (86%)

diff --git a/meta/recipes-devtools/python/python3-urllib3_1.26.13.bb b/meta/recipes-devtools/python/python3-urllib3_1.26.14.bb
similarity index 86%
rename from meta/recipes-devtools/python/python3-urllib3_1.26.13.bb
rename to meta/recipes-devtools/python/python3-urllib3_1.26.14.bb
index 7af95117cf1..f35a141df26 100644
--- a/meta/recipes-devtools/python/python3-urllib3_1.26.13.bb
+++ b/meta/recipes-devtools/python/python3-urllib3_1.26.14.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/shazow/urllib3"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c2823cb995439c984fd62a973d79815c"
 
-SRC_URI[sha256sum] = "c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8"
+SRC_URI[sha256sum] = "076907bf8fd355cde77728471316625a4d2f7e713c125f51953bb5b3eecf4f72"
 
 inherit pypi setuptools3
 
-- 
2.30.2

[PATCH 14/14] python3-sphinx: upgrade 6.0.0 -> 6.1.3

[Tim Orling]

https://www.sphinx-doc.org/en/master/changes.html#release-6-1-3-released-jan-10-2023
https://www.sphinx-doc.org/en/master/changes.html#release-6-1-2-released-jan-07-2023
https://www.sphinx-doc.org/en/master/changes.html#release-6-1-1-released-jan-05-2023
https://www.sphinx-doc.org/en/master/changes.html#release-6-1-0-released-jan-05-2023
https://www.sphinx-doc.org/en/master/changes.html#release-6-0-1-released-jan-05-2023

Signed-off-by: Tim Orling <tim.orling@konsulko.com>
---
 ...phinx_6.0.0.bb => python3-sphinx_6.1.3.bb} | 26 +++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/python/{python3-sphinx_6.0.0.bb => python3-sphinx_6.1.3.bb} (49%)

diff --git a/meta/recipes-devtools/python/python3-sphinx_6.0.0.bb b/meta/recipes-devtools/python/python3-sphinx_6.1.3.bb
similarity index 49%
rename from meta/recipes-devtools/python/python3-sphinx_6.0.0.bb
rename to meta/recipes-devtools/python/python3-sphinx_6.1.3.bb
index 5e565e745d6..d77ad0a6fe1 100644
--- a/meta/recipes-devtools/python/python3-sphinx_6.0.0.bb
+++ b/meta/recipes-devtools/python/python3-sphinx_6.1.3.bb
@@ -1,12 +1,34 @@
+# FIXME: the LIC_FILES_CHKSUM values have been updated by 'devtool upgrade'.
+# The following is the difference between the old and the new license text.
+# Please update the LICENSE value if needed, and summarize the changes in
+# the commit message via 'License-Update:' tag.
+# (example: 'License-Update: copyright years updated.')
+#
+# The changes:
+#
+# --- LICENSE
+# +++ LICENSE
+# @@ -4,7 +4,7 @@
+#  Unless otherwise indicated, all code in the Sphinx project is licenced under the
+#  two clause BSD licence below.
+#  
+# -Copyright (c) 2007-2022 by the Sphinx team (see AUTHORS file).
+# +Copyright (c) 2007-2023 by the Sphinx team (see AUTHORS file).
+#  All rights reserved.
+#  
+#  Redistribution and use in source and binary forms, with or without
+# 
+#
+
 DESCRIPTION = "Python documentation generator"
 HOMEPAGE = "http://sphinx-doc.org/"
 SECTION = "devel/python"
 LICENSE = "BSD-2-Clause & MIT & BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=2214a89317448c7f792f5b75dd6726e4"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=066da51ab732319a06beae4f10788577"
 
 PYPI_PACKAGE = "Sphinx"
 
-SRC_URI[sha256sum] = "58c140ecd9aa0abbc8ff6da48a266648eac9e5bfc8e49576efd2979bf46f5961"
+SRC_URI[sha256sum] = "0dac3b698538ffef41716cf97ba26c1c7788dba73ce6f150c1ff5b4720786dd2"
 
 inherit python_flit_core pypi
 
-- 
2.30.2

Re: [OE-core] [PATCH 14/14] python3-sphinx: upgrade 6.0.0 -> 6.1.3

[Richard Purdie]

On Fri, 2023-02-03 at 09:50 -0800, Tim Orling wrote:
> https://www.sphinx-doc.org/en/master/changes.html#release-6-1-3-released-jan-10-2023
> https://www.sphinx-doc.org/en/master/changes.html#release-6-1-2-released-jan-07-2023
> https://www.sphinx-doc.org/en/master/changes.html#release-6-1-1-released-jan-05-2023
> https://www.sphinx-doc.org/en/master/changes.html#release-6-1-0-released-jan-05-2023
> https://www.sphinx-doc.org/en/master/changes.html#release-6-0-1-released-jan-05-2023
> 
> Signed-off-by: Tim Orling <tim.orling@konsulko.com>
> ---
>  ...phinx_6.0.0.bb => python3-sphinx_6.1.3.bb} | 26 +++++++++++++++++--
>  1 file changed, 24 insertions(+), 2 deletions(-)
>  rename meta/recipes-devtools/python/{python3-sphinx_6.0.0.bb => python3-sphinx_6.1.3.bb} (49%)
> 
> diff --git a/meta/recipes-devtools/python/python3-sphinx_6.0.0.bb b/meta/recipes-devtools/python/python3-sphinx_6.1.3.bb
> similarity index 49%
> rename from meta/recipes-devtools/python/python3-sphinx_6.0.0.bb
> rename to meta/recipes-devtools/python/python3-sphinx_6.1.3.bb
> index 5e565e745d6..d77ad0a6fe1 100644
> --- a/meta/recipes-devtools/python/python3-sphinx_6.0.0.bb
> +++ b/meta/recipes-devtools/python/python3-sphinx_6.1.3.bb
> @@ -1,12 +1,34 @@
> +# FIXME: the LIC_FILES_CHKSUM values have been updated by 'devtool upgrade'.
> +# The following is the difference between the old and the new license text.
> +# Please update the LICENSE value if needed, and summarize the changes in
> +# the commit message via 'License-Update:' tag.
> +# (example: 'License-Update: copyright years updated.')
> +#
> +# The changes:
> +#
> +# --- LICENSE
> +# +++ LICENSE
> +# @@ -4,7 +4,7 @@
> +#  Unless otherwise indicated, all code in the Sphinx project is licenced under the
> +#  two clause BSD licence below.
> +#  
> +# -Copyright (c) 2007-2022 by the Sphinx team (see AUTHORS file).
> +# +Copyright (c) 2007-2023 by the Sphinx team (see AUTHORS file).
> +#  All rights reserved.
> +#  
> +#  Redistribution and use in source and binary forms, with or without
> +# 
> +#
> +
>  DESCRIPTION = "Python documentation generator"
>  HOMEPAGE = "http://sphinx-doc.org/"
>  SECTION = "devel/python"
>  LICENSE = "BSD-2-Clause & MIT & BSD-3-Clause"
> -LIC_FILES_CHKSUM = "file://LICENSE;md5=2214a89317448c7f792f5b75dd6726e4"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=066da51ab732319a06beae4f10788577"
>  
>  


The license copyright years changed so we need to mention that in the
commit message instead of the FIXME :)

Cheers,

Richard

[PATCH 14/14 v2] python3-sphinx: upgrade 6.0.0 -> 6.1.3

[Tim Orling]

License-Update: Update copyright years

https://www.sphinx-doc.org/en/master/changes.html#release-6-1-3-released-jan-10-2023
https://www.sphinx-doc.org/en/master/changes.html#release-6-1-2-released-jan-07-2023
https://www.sphinx-doc.org/en/master/changes.html#release-6-1-1-released-jan-05-2023
https://www.sphinx-doc.org/en/master/changes.html#release-6-1-0-released-jan-05-2023
https://www.sphinx-doc.org/en/master/changes.html#release-6-0-1-released-jan-05-2023

Signed-off-by: Tim Orling <tim.orling@konsulko.com>
---
Changes in v2:
* Remove FIXME and add License-Update reason (thank you RP)

 .../{python3-sphinx_6.0.0.bb => python3-sphinx_6.1.3.bb}      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/python/{python3-sphinx_6.0.0.bb => python3-sphinx_6.1.3.bb} (84%)

diff --git a/meta/recipes-devtools/python/python3-sphinx_6.0.0.bb b/meta/recipes-devtools/python/python3-sphinx_6.1.3.bb
similarity index 84%
rename from meta/recipes-devtools/python/python3-sphinx_6.0.0.bb
rename to meta/recipes-devtools/python/python3-sphinx_6.1.3.bb
index 5e565e745d6..f75988a6a0d 100644
--- a/meta/recipes-devtools/python/python3-sphinx_6.0.0.bb
+++ b/meta/recipes-devtools/python/python3-sphinx_6.1.3.bb
@@ -2,11 +2,11 @@ DESCRIPTION = "Python documentation generator"
 HOMEPAGE = "http://sphinx-doc.org/"
 SECTION = "devel/python"
 LICENSE = "BSD-2-Clause & MIT & BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=2214a89317448c7f792f5b75dd6726e4"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=066da51ab732319a06beae4f10788577"
 
 PYPI_PACKAGE = "Sphinx"
 
-SRC_URI[sha256sum] = "58c140ecd9aa0abbc8ff6da48a266648eac9e5bfc8e49576efd2979bf46f5961"
+SRC_URI[sha256sum] = "0dac3b698538ffef41716cf97ba26c1c7788dba73ce6f150c1ff5b4720786dd2"
 
 inherit python_flit_core pypi
 
-- 
2.30.2