python-pdm-pep517: update to 1.1.1
This commit is contained in:
parent
6d0d29d6d1
commit
6310c4173f
@ -3,8 +3,8 @@
|
|||||||
_realname=pdm-pep517
|
_realname=pdm-pep517
|
||||||
pkgbase=mingw-w64-python-${_realname}
|
pkgbase=mingw-w64-python-${_realname}
|
||||||
pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
|
pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
|
||||||
pkgver=1.0.6
|
pkgver=1.1.1
|
||||||
pkgrel=2
|
pkgrel=1
|
||||||
pkgdesc="A PEP 517 backend for PDM that supports PEP 621 metadata (mingw-w64)"
|
pkgdesc="A PEP 517 backend for PDM that supports PEP 621 metadata (mingw-w64)"
|
||||||
arch=('any')
|
arch=('any')
|
||||||
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
|
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
|
||||||
@ -20,18 +20,15 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python-build"
|
|||||||
"${MINGW_PACKAGE_PREFIX}-python-installer")
|
"${MINGW_PACKAGE_PREFIX}-python-installer")
|
||||||
checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest")
|
checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest")
|
||||||
source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz"
|
source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz"
|
||||||
"python-pdm-pep517-1.0.3-devendor.patch"
|
"python-pdm-pep517-1.0.3-devendor.patch")
|
||||||
"support-packaging-22.patch")
|
sha256sums=('622286f1f0a952b84bc151b8ea9dc7af4c632183ebc49b8a6299b53537a62234'
|
||||||
sha256sums=('a4407703d50fa4d671383a354868b05a13060c1bf38264cbb5ddc9a73e4a1dc5'
|
'd9cd6704b7313eb36edc5a919d6ee8761570d85fb3f795fbfa4eaf34762258c4')
|
||||||
'4100452f4581e9ad4bc5e293419ab54c3cd3a42e8e3779c0845c0a1a1d931786'
|
|
||||||
'5df64023e5f4b7c907ee4891f5d2273a3f62788cb783367c733341fc02c8e53c')
|
|
||||||
noextract=("${_realname}-${pkgver}.tar.gz")
|
noextract=("${_realname}-${pkgver}.tar.gz")
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
tar -xzf "${srcdir}"/${_realname}-${pkgver}.tar.gz || true
|
tar -xzf "${srcdir}"/${_realname}-${pkgver}.tar.gz || true
|
||||||
|
|
||||||
cd "${srcdir}"/${_realname}-${pkgver}
|
cd "${srcdir}"/${_realname}-${pkgver}
|
||||||
patch -p1 -i "${srcdir}"/support-packaging-22.patch
|
|
||||||
patch -p1 -i "${srcdir}"/python-pdm-pep517-1.0.3-devendor.patch
|
patch -p1 -i "${srcdir}"/python-pdm-pep517-1.0.3-devendor.patch
|
||||||
rm -frv pdm/pep517/_vendor
|
rm -frv pdm/pep517/_vendor
|
||||||
|
|
||||||
|
|||||||
@ -32,12 +32,11 @@
|
|||||||
cd,
|
cd,
|
||||||
--- a/pdm/pep517/scm.py
|
--- a/pdm/pep517/scm.py
|
||||||
+++ b/pdm/pep517/scm.py
|
+++ b/pdm/pep517/scm.py
|
||||||
@@ -14,8 +14,7 @@
|
@@ -14,7 +14,7 @@
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Any, Iterable, NamedTuple
|
from typing import Any, Iterable, NamedTuple
|
||||||
|
|
||||||
-from pdm.pep517._vendor.packaging.version import LegacyVersion, Version
|
-from pdm.pep517._vendor.packaging.version import Version
|
||||||
-from pdm.pep517._vendor.packaging.version import parse as parse_version
|
|
||||||
+from packaging.version import Version
|
+from packaging.version import Version
|
||||||
|
|
||||||
DEFAULT_TAG_REGEX = re.compile(
|
DEFAULT_TAG_REGEX = re.compile(
|
||||||
|
|||||||
@ -1,50 +0,0 @@
|
|||||||
--- a/pdm/pep517/scm.py
|
|
||||||
+++ b/pdm/pep517/scm.py
|
|
||||||
@@ -53,7 +52,7 @@ def _subprocess_call(
|
|
||||||
|
|
||||||
|
|
||||||
class VersionInfo(NamedTuple):
|
|
||||||
- version: Version | LegacyVersion
|
|
||||||
+ version: Version
|
|
||||||
distance: int | None
|
|
||||||
dirty: bool
|
|
||||||
node: str | None
|
|
||||||
@@ -61,7 +60,7 @@ class VersionInfo(NamedTuple):
|
|
||||||
|
|
||||||
|
|
||||||
def meta(
|
|
||||||
- tag: str | Version | LegacyVersion,
|
|
||||||
+ tag: str | Version,
|
|
||||||
distance: int | None = None,
|
|
||||||
dirty: bool = False,
|
|
||||||
node: str | None = None,
|
|
||||||
@@ -136,7 +135,7 @@ def _parse_version_tag(tag: str) -> _ParseResult | None:
|
|
||||||
return result
|
|
||||||
|
|
||||||
|
|
||||||
-def tag_to_version(tag: str) -> Version | LegacyVersion:
|
|
||||||
+def tag_to_version(tag: str) -> Version:
|
|
||||||
"""
|
|
||||||
take a tag that might be prefixed with a keyword and return only the version part
|
|
||||||
:param config: optional configuration object
|
|
||||||
@@ -151,10 +150,10 @@ def tag_to_version(tag: str) -> Version | LegacyVersion:
|
|
||||||
if tagdict.suffix:
|
|
||||||
warnings.warn(f"tag {tag!r} will be stripped of its suffix '{tagdict.suffix}'")
|
|
||||||
|
|
||||||
- return parse_version(version)
|
|
||||||
+ return Version(version)
|
|
||||||
|
|
||||||
|
|
||||||
-def tags_to_versions(tags: Iterable[str]) -> list[Version | LegacyVersion]:
|
|
||||||
+def tags_to_versions(tags: Iterable[str]) -> list[Version]:
|
|
||||||
"""
|
|
||||||
take tags that might be prefixed with a keyword and return only the version part
|
|
||||||
:param tags: an iterable of tags
|
|
||||||
@@ -241,7 +240,7 @@ def _hg_tagdist_normalize_tagcommit(
|
|
||||||
return meta(tag)
|
|
||||||
|
|
||||||
|
|
||||||
-def guess_next_version(tag_version: Version | LegacyVersion) -> str:
|
|
||||||
+def guess_next_version(tag_version: Version) -> str:
|
|
||||||
version = _strip_local(str(tag_version))
|
|
||||||
return _bump_dev(version) or _bump_regex(version)
|
|
||||||
Loading…
x
Reference in New Issue
Block a user