1.ChangeLog Fix readthedocs 2.Remove following patches as they were merged upstream use-poetry-core.patch 208.patch
3.Change license checksum as position of License Info has changed in PKG-INFO file. Signed-off-by: Liu Yiding <[email protected]> --- .../python/python3-pyrad/208.patch | 51 ------------------- .../python3-pyrad/use-poetry-core.patch | 26 ---------- ...n3-pyrad_2.4.bb => python3-pyrad_2.5.2.bb} | 8 +-- 3 files changed, 2 insertions(+), 83 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-pyrad/208.patch delete mode 100644 meta-python/recipes-devtools/python/python3-pyrad/use-poetry-core.patch rename meta-python/recipes-devtools/python/{python3-pyrad_2.4.bb => python3-pyrad_2.5.2.bb} (50%) diff --git a/meta-python/recipes-devtools/python/python3-pyrad/208.patch b/meta-python/recipes-devtools/python/python3-pyrad/208.patch deleted file mode 100644 index b08f183583..0000000000 --- a/meta-python/recipes-devtools/python/python3-pyrad/208.patch +++ /dev/null @@ -1,51 +0,0 @@ -From d17438da2008f48aa13cc95a626c990bf645799a Mon Sep 17 00:00:00 2001 -From: Luca Barbieri <[email protected]> -Date: Wed, 8 Jan 2025 10:35:22 +0100 -Subject: [PATCH 1/2] Fix pyproject.toml format - -Fix pyproject format to correctly build with poetry-core 2.0.0 -Upstream-Status: Submitted [https://github.com/pyradius/pyrad/pull/208] -Signed-off-by: Khem Raj <[email protected]> ---- - pyproject.toml | 28 ++++++++++++++-------------- - 1 file changed, 14 insertions(+), 14 deletions(-) - ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -2,16 +2,16 @@ - requires = ["poetry-core>=1.0.0"] - build-backend = "poetry.core.masonry.api" - --[tool.poetry] -+[project] - name = "pyrad" - version= "2.4" - readme = "README.rst" - license = "BSD-3-Clause" - description="RADIUS tools" - authors = [ -- "Istvan Ruzman <[email protected]>", -- "Christian Giese <[email protected]>", --] -+ { name = "Istvan Ruzman", email = "[email protected]" }, -+ { name = "Christian Giese", email = "[email protected]" }, -+ ] - keywords = ["AAA", "accounting", "authentication", "authorization", "RADIUS"] - classifiers = [ - "Development Status :: 6 - Mature", -@@ -28,7 +28,7 @@ include = [ - "example/*" - ] - --[tool.poetry.urls] -+[project.urls] - repository = "https://github.com/pyradius/pyrad"; - - [tool.poetry.dependencies] -@@ -36,5 +36,5 @@ python = "^2.7 || ^3.6" - six = "^1.15.0" - netaddr = "^0.8" - --[tool.poetry.dev-dependencies] -+[tool.poetry.group.dev.dependencies] - nose = "^0.10.0b1" diff --git a/meta-python/recipes-devtools/python/python3-pyrad/use-poetry-core.patch b/meta-python/recipes-devtools/python/python3-pyrad/use-poetry-core.patch deleted file mode 100644 index 43a177da0a..0000000000 --- a/meta-python/recipes-devtools/python/python3-pyrad/use-poetry-core.patch +++ /dev/null @@ -1,26 +0,0 @@ -Upstream-Status: Backport [https://github.com/pyradius/pyrad/commit/ffe182a44909e8f8278fb3e2ea052ddc097b48b9] -Signed-off-by: Ross Burton <[email protected]> - -From a4b70067dd6269e14a2f9530d820390a8a454231 Mon Sep 17 00:00:00 2001 -From: Martin Weinelt <[email protected]> -Date: Thu, 14 Apr 2022 22:07:37 +0200 -Subject: [PATCH] Use poetry-core for pyproject based builds - -https://github.com/python-poetry/poetry-core#why-is-this-required ---- - pyproject.toml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pyproject.toml b/pyproject.toml -index 87b1df3..711c52f 100755 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -1,6 +1,6 @@ - [build-system] --requires = ["poetry>=1.0"] --build-backend = "poetry.masonry.api" -+requires = ["poetry-core>=1.0.0"] -+build-backend = "poetry.core.masonry.api" - - [tool.poetry] - name = "pyrad" diff --git a/meta-python/recipes-devtools/python/python3-pyrad_2.4.bb b/meta-python/recipes-devtools/python/python3-pyrad_2.5.2.bb similarity index 50% rename from meta-python/recipes-devtools/python/python3-pyrad_2.4.bb rename to meta-python/recipes-devtools/python/python3-pyrad_2.5.2.bb index e8cfffc9cc..415a8a8212 100644 --- a/meta-python/recipes-devtools/python/python3-pyrad_2.4.bb +++ b/meta-python/recipes-devtools/python/python3-pyrad_2.5.2.bb @@ -1,14 +1,10 @@ SUMMARY = "RADIUS tools" SECTION = "devel/python" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e910b35b0ef4e1f665b9a75d6afb7709" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=53dbfa56f61b90215a9f8f0d527c043d" PYPI_PACKAGE = "pyrad" -SRC_URI[sha256sum] = "057de4b7e89d8da57ba782c1bde45c63ebee720ae2c0b0a69beaff15c47e30d9" - -SRC_URI += "file://use-poetry-core.patch \ - file://208.patch \ - " +SRC_URI[sha256sum] = "368e8d3cb7b9e2ca9e4357b343787238bf135edd3f3598cf26ccd65d32506ff9" inherit pypi python_poetry_core -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#124205): https://lists.openembedded.org/g/openembedded-devel/message/124205 Mute This Topic: https://lists.openembedded.org/mt/117651049/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
