diff --git a/python/python-pdm-backend/.SRCINFO b/python/python-pdm-backend/.SRCINFO index aca41eea2a..7da2f09fda 100644 --- a/python/python-pdm-backend/.SRCINFO +++ b/python/python-pdm-backend/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = python-pdm-backend pkgdesc = The build backend used by PDM that supports latest packaging standards - pkgver = 2.3.3 + pkgver = 2.4.3 pkgrel = 2 url = https://github.com/pdm-project/pdm-backend arch = any @@ -19,11 +19,11 @@ pkgbase = python-pdm-backend depends = python-tomli-w optdepends = python-setuptools: for setuptools support optdepends = python-editables: for editables backend support - source = pdm-backend-2.3.3.tar.gz::https://github.com/pdm-project/pdm-backend/archive/refs/tags/2.3.3.tar.gz - source = python-pdm-backend-2.3.1-devendor.patch - sha256sums = 074a42eecb19fdf0231cf51ddcb596dc5ad9e22f60af3453db4423490841ef0e - sha256sums = ebf0d469df8b2f436bd55d633576f417a1f9cec5881b71cc709630ec0be3c02b - b2sums = 14f2584f22f1c4e08f687c77621269ae1e5acfe4babb1ab427c10d65ff07841b8175479f867870b9a5745db76444ca140a7da497a94c831ca6d0ea1e67b4e88f - b2sums = 25f63c4f6a2559ca763c92ec9cbe7ddb6de15d420222ad5c88875a0e11a0f79dd2a7725bd2b7a4f0834839d1c2bebfdd6097c8e1d7254ae75489f009f44c9cee + source = pdm-backend-2.4.3.tar.gz::https://github.com/pdm-project/pdm-backend/archive/refs/tags/2.4.3.tar.gz + source = python-pdm-backend-2.4.3-devendor.patch + sha256sums = a97486ff2954a8e05fb04bc8257cc8c2da65a9cafd372d6c3c037a2d30ea6630 + sha256sums = 2bc1924abc74c66ea3056ddefdcf7a7e9b76c4ca9f87a0bbddc1a5da73a99eaa + b2sums = 36f65db90de5b507348a2a8407ae0eec8e1939c6b0fea1181548de910fad2497594e17aee7d478572a32e28260ef15660bddfaec4d921b2975b5a51da031dc1e + b2sums = c65bd035b0caad6b18059de5fec99ee358dc2e5552de9349e9d2c1166f95d6bd9615a0087f0003ff828002eb0ea0a36461db148acb694a0ac6ec469235724aa6 pkgname = python-pdm-backend diff --git a/python/python-pdm-backend/PKGBUILD b/python/python-pdm-backend/PKGBUILD index 49a10558ac..f1f13156ab 100644 --- a/python/python-pdm-backend/PKGBUILD +++ b/python/python-pdm-backend/PKGBUILD @@ -5,7 +5,7 @@ _devendored=1 _name=pdm-backend pkgname=python-pdm-backend -pkgver=2.3.3 +pkgver=2.4.3 pkgrel=2 pkgdesc="The build backend used by PDM that supports latest packaging standards" arch=(any) @@ -40,16 +40,16 @@ optdepends=( ) source=( $_name-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz - $pkgname-2.3.1-devendor.patch + $pkgname-2.4.3-devendor.patch ) -sha256sums=('074a42eecb19fdf0231cf51ddcb596dc5ad9e22f60af3453db4423490841ef0e' - 'ebf0d469df8b2f436bd55d633576f417a1f9cec5881b71cc709630ec0be3c02b') -b2sums=('14f2584f22f1c4e08f687c77621269ae1e5acfe4babb1ab427c10d65ff07841b8175479f867870b9a5745db76444ca140a7da497a94c831ca6d0ea1e67b4e88f' - '25f63c4f6a2559ca763c92ec9cbe7ddb6de15d420222ad5c88875a0e11a0f79dd2a7725bd2b7a4f0834839d1c2bebfdd6097c8e1d7254ae75489f009f44c9cee') +sha256sums=('a97486ff2954a8e05fb04bc8257cc8c2da65a9cafd372d6c3c037a2d30ea6630' + '2bc1924abc74c66ea3056ddefdcf7a7e9b76c4ca9f87a0bbddc1a5da73a99eaa') +b2sums=('36f65db90de5b507348a2a8407ae0eec8e1939c6b0fea1181548de910fad2497594e17aee7d478572a32e28260ef15660bddfaec4d921b2975b5a51da031dc1e' + 'c65bd035b0caad6b18059de5fec99ee358dc2e5552de9349e9d2c1166f95d6bd9615a0087f0003ff828002eb0ea0a36461db148acb694a0ac6ec469235724aa6') prepare() { if (( _devendored == 1 )); then - patch -Np1 -d $_name-$pkgver -i ../$pkgname-2.3.1-devendor.patch + patch -Np1 -d $_name-$pkgver -i ../$pkgname-2.4.3-devendor.patch rm -frv $_name-$pkgver/src/pdm/backend/_vendor fi } diff --git a/python/python-pdm-backend/python-pdm-backend-2.4.3-devendor.patch b/python/python-pdm-backend/python-pdm-backend-2.4.3-devendor.patch new file mode 100644 index 0000000000..9a22a080f2 --- /dev/null +++ b/python/python-pdm-backend/python-pdm-backend-2.4.3-devendor.patch @@ -0,0 +1,151 @@ +diff --git i/src/pdm/backend/base.py w/src/pdm/backend/base.py +index e4a75b8..c14417b 100644 +--- i/src/pdm/backend/base.py ++++ w/src/pdm/backend/base.py +@@ -16,7 +16,7 @@ from typing import ( + cast, + ) + +-from pdm.backend._vendor.pyproject_metadata import StandardMetadata ++from pyproject_metadata import StandardMetadata + from pdm.backend.config import Config + from pdm.backend.hooks import BuildHookInterface, Context + from pdm.backend.hooks.version import DynamicVersionBuildHook +diff --git i/src/pdm/backend/config.py w/src/pdm/backend/config.py +index 382e5f4..e8efdbf 100644 +--- i/src/pdm/backend/config.py ++++ w/src/pdm/backend/config.py +@@ -7,8 +7,8 @@ from functools import cached_property + from pathlib import Path + from typing import TYPE_CHECKING, Any, TypeVar + +-from pdm.backend._vendor import tomli_w +-from pdm.backend._vendor.pyproject_metadata import ConfigurationError, StandardMetadata ++import tomli_w ++from pyproject_metadata import ConfigurationError, StandardMetadata + from pdm.backend.exceptions import ConfigError, ValidationError + from pdm.backend.structures import Table + from pdm.backend.utils import find_packages_iter, is_relative_path +@@ -16,7 +16,7 @@ from pdm.backend.utils import find_packages_iter, is_relative_path + if sys.version_info >= (3, 11): + import tomllib + else: +- import pdm.backend._vendor.tomli as tomllib ++ import tomli as tomllib + + T = TypeVar("T") + +diff --git i/src/pdm/backend/editable.py w/src/pdm/backend/editable.py +index 379699d..10a316d 100644 +--- i/src/pdm/backend/editable.py ++++ w/src/pdm/backend/editable.py +@@ -4,8 +4,8 @@ import os + import warnings + from pathlib import Path + +-from pdm.backend._vendor.editables import EditableProject +-from pdm.backend._vendor.packaging.utils import canonicalize_name ++from editables import EditableProject ++from packaging.utils import canonicalize_name + from pdm.backend.exceptions import ConfigError, PDMWarning + from pdm.backend.hooks.base import Context + from pdm.backend.utils import to_filename +diff --git i/src/pdm/backend/hooks/version/__init__.py w/src/pdm/backend/hooks/version/__init__.py +index d3b7856..d26e1f6 100644 +--- i/src/pdm/backend/hooks/version/__init__.py ++++ w/src/pdm/backend/hooks/version/__init__.py +@@ -7,7 +7,7 @@ import warnings + from pathlib import Path + from typing import Callable + +-from pdm.backend._vendor.packaging.version import Version ++from packaging.version import Version + from pdm.backend.exceptions import ConfigError, PDMWarning, ValidationError + from pdm.backend.hooks.base import Context + from pdm.backend.hooks.version.scm import SCMVersion as SCMVersion +diff --git i/src/pdm/backend/hooks/version/scm.py w/src/pdm/backend/hooks/version/scm.py +index f6da7a7..d5fc2d4 100644 +--- i/src/pdm/backend/hooks/version/scm.py ++++ w/src/pdm/backend/hooks/version/scm.py +@@ -16,7 +16,7 @@ from datetime import datetime, timezone + from pathlib import Path + from typing import TYPE_CHECKING, NamedTuple + +-from pdm.backend._vendor.packaging.version import Version ++from packaging.version import Version + + if TYPE_CHECKING: + from _typeshed import StrPath +diff --git i/src/pdm/backend/intree.py w/src/pdm/backend/intree.py +index c730c17..26a1e78 100644 +--- i/src/pdm/backend/intree.py ++++ w/src/pdm/backend/intree.py +@@ -16,7 +16,7 @@ from pdm.backend import ( + if sys.version_info >= (3, 11): + import tomllib + else: +- import pdm.backend._vendor.tomli as tomllib ++ import tomli as tomllib + + + def get_requires_for_build_wheel( +diff --git i/src/pdm/backend/sdist.py w/src/pdm/backend/sdist.py +index b86be89..7c936b1 100644 +--- i/src/pdm/backend/sdist.py ++++ w/src/pdm/backend/sdist.py +@@ -8,7 +8,7 @@ from pathlib import Path + from posixpath import join as pjoin + from typing import Iterable + +-from pdm.backend._vendor.packaging.utils import canonicalize_name ++from packaging.utils import canonicalize_name + from pdm.backend.base import Builder + from pdm.backend.hooks import Context + from pdm.backend.utils import normalize_file_permissions, safe_version, to_filename +diff --git i/src/pdm/backend/utils.py w/src/pdm/backend/utils.py +index 3893011..9b76182 100644 +--- i/src/pdm/backend/utils.py ++++ w/src/pdm/backend/utils.py +@@ -13,9 +13,9 @@ from fnmatch import fnmatchcase + from pathlib import Path + from typing import Any, Callable, Generator, Iterable, Match + +-from pdm.backend._vendor.packaging.markers import Marker +-from pdm.backend._vendor.packaging.requirements import Requirement +-from pdm.backend._vendor.packaging.version import InvalidVersion, Version ++from packaging.markers import Marker ++from packaging.requirements import Requirement ++from packaging.version import InvalidVersion, Version + from pdm.backend.exceptions import ConfigError + + +diff --git i/src/pdm/backend/wheel.py w/src/pdm/backend/wheel.py +index 6cd743c..6837afd 100644 +--- i/src/pdm/backend/wheel.py ++++ w/src/pdm/backend/wheel.py +@@ -15,9 +15,9 @@ from importlib.metadata import version as get_version + from pathlib import Path + from typing import IO, Any, Iterable, Mapping, NamedTuple, cast + +-from pdm.backend._vendor.packaging import tags +-from pdm.backend._vendor.packaging.specifiers import SpecifierSet +-from pdm.backend._vendor.packaging.utils import _build_tag_regex, canonicalize_name ++from packaging import tags ++from packaging.specifiers import SpecifierSet ++from packaging.utils import _build_tag_regex, canonicalize_name + from pdm.backend.base import Builder + from pdm.backend.hooks import Context + from pdm.backend.hooks.setuptools import SetuptoolsBuildHook +diff --git i/tests/pdm/backend/hooks/version/test_scm.py w/tests/pdm/backend/hooks/version/test_scm.py +index a3c995b..366d9ac 100644 +--- i/tests/pdm/backend/hooks/version/test_scm.py ++++ w/tests/pdm/backend/hooks/version/test_scm.py +@@ -12,7 +12,7 @@ from typing import cast + + import pytest + +-from pdm.backend._vendor.packaging.version import Version ++from packaging.version import Version + from pdm.backend.hooks.version.scm import ( + SCMVersion, + default_version_formatter,