diff --git a/mingw-w64-python-pdm-backend/PKGBUILD b/mingw-w64-python-pdm-backend/PKGBUILD index 9efeb17f99..4243b839e6 100644 --- a/mingw-w64-python-pdm-backend/PKGBUILD +++ b/mingw-w64-python-pdm-backend/PKGBUILD @@ -3,7 +3,7 @@ _realname=pdm-backend pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") -pkgver=2.1.8 +pkgver=2.3.2 pkgrel=1 pkgdesc="The build backend used by PDM that supports latest packaging standards (mingw-w64)" arch=('any') @@ -11,7 +11,8 @@ mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') msys2_references=( 'pypi: pdm-backend' ) -url='https://github.com/pdm-project/pdm-backend' +msys2_repository_url='https://github.com/pdm-project/pdm-backend' +url='https://backend.pdm-project.org/' license=('spdx:MIT') depends=("${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-python-packaging" @@ -22,17 +23,17 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python-build" checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest") options=('!strip') source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname/-/_}-${pkgver}.tar.gz" - "python-pdm-backend-2.0.7-devendor.patch") -sha256sums=('2487dfbd13f69d80fb4e6a08006a3ee68272833970813047dc5fcfacdfdc0151' - 'a83fbc5838139d2cade2ed28682875fccf68df49962319c6642a45c75cd3de93') + "python-pdm-backend-2.3.1-devendor.patch") +sha256sums=('b0c47e6a5f6bd7b0e2263eede0e6b2cf164a83ade81b7e73dc10f8254f60b828' + '56e05095adf7767b131fd29d0a446e13926e71bf98f9ffc2c71e378beaaae7fa') noextract=("${_realname/-/_}-${pkgver}.tar.gz") prepare() { echo "Extracting ${_realname/-/_}-${pkgver}.tar.gz ..." tar -xzf ${_realname/-/_}-${pkgver}.tar.gz || true cd "${srcdir}/${_realname/-/_}-${pkgver}" - # copied from https://gitlab.archlinux.org/archlinux/packaging/packages/python-pdm-backend/-/blob/d64a199c/python-pdm-backend-2.0.7-devendor.patch - patch -p1 -i "${srcdir}"/python-pdm-backend-2.0.7-devendor.patch + # copied from https://gitlab.archlinux.org/archlinux/packaging/packages/python-pdm-backend/-/blob/main/python-pdm-backend-2.3.1-devendor.patch + patch -p1 -i "${srcdir}"/python-pdm-backend-2.3.1-devendor.patch rm -rf src/pdm/backend/_vendor } diff --git a/mingw-w64-python-pdm-backend/python-pdm-backend-2.0.7-devendor.patch b/mingw-w64-python-pdm-backend/python-pdm-backend-2.3.1-devendor.patch similarity index 84% rename from mingw-w64-python-pdm-backend/python-pdm-backend-2.0.7-devendor.patch rename to mingw-w64-python-pdm-backend/python-pdm-backend-2.3.1-devendor.patch index 1b63da0f54..beddfd7eaa 100644 --- a/mingw-w64-python-pdm-backend/python-pdm-backend-2.0.7-devendor.patch +++ b/mingw-w64-python-pdm-backend/python-pdm-backend-2.3.1-devendor.patch @@ -22,20 +22,22 @@ --- a/src/pdm/backend/editable.py +++ b/src/pdm/backend/editable.py -@@ -6,7 +6,7 @@ - - from editables import EditableProject +@@ -4,8 +4,8 @@ + 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 --- a/src/pdm/backend/hooks/version/scm.py +++ b/src/pdm/backend/hooks/version/scm.py -@@ -15,7 +15,7 @@ +@@ -16,7 +16,7 @@ from pathlib import Path - from typing import TYPE_CHECKING, Iterable, NamedTuple + from typing import TYPE_CHECKING, Callable, NamedTuple -from pdm.backend._vendor.packaging.version import Version +from packaging.version import Version @@ -44,7 +46,7 @@ from _typeshed import StrPath --- a/src/pdm/backend/intree.py +++ b/src/pdm/backend/intree.py -@@ -8,7 +8,7 @@ +@@ -16,7 +16,7 @@ if sys.version_info >= (3, 11): import tomllib else: @@ -66,19 +68,17 @@ from pdm.backend.utils import normalize_file_permissions, safe_version, to_filename --- a/src/pdm/backend/utils.py +++ b/src/pdm/backend/utils.py -@@ -13,10 +13,10 @@ +@@ -14,9 +14,9 @@ from pathlib import Path - from typing import Callable, Generator, Iterable, Match + from typing import Any, Callable, Generator, Iterable, Match --from pdm.backend._vendor.packaging import tags -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 import tags +from packaging.markers import Marker +from packaging.requirements import Requirement +from packaging.version import InvalidVersion, Version - from pdm.backend.macosx_platform import calculate_macosx_platform_tag + from pdm.backend.exceptions import ConfigError --- a/src/pdm/backend/wheel.py @@ -89,10 +89,10 @@ -from pdm.backend._vendor.packaging import tags -from pdm.backend._vendor.packaging.specifiers import SpecifierSet --from pdm.backend._vendor.packaging.utils import canonicalize_name +-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 canonicalize_name ++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