summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Runge2022-07-31 11:29:33 +0000
committerDavid Runge2022-07-31 11:29:33 +0000
commit908a9b7738f9201f6205ff73cac7894fc3c618e3 (patch)
treea095f83cd40422ec6c79db5663c34db606d39807
parentadfd527dbc5c7af343ec02ceed385846907a5a0f (diff)
downloadaur-908a9b7738f9201f6205ff73cac7894fc3c618e3.tar.gz
Upgrade to 1.0.3.
Update devendoring patch.
-rw-r--r--PKGBUILD14
-rw-r--r--python-pdm-pep517-1.0.3-devendor.patch (renamed from python-pdm-pep517-1.0.2-devendor.patch)64
2 files changed, 30 insertions, 48 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 3a7cfc49d8b1..5070d57d4b9b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ _name=pdm-pep517
pkgname=python-pdm-pep517
# WARNING: python-pdm may not be compatible with whatever pdm-pep517 can be upgraded to:
# https://github.com/pdm-project/pdm/issues/1165
-pkgver=1.0.2
+pkgver=1.0.3
pkgrel=1
epoch=1
pkgdesc="A PEP 517 backend for PDM that supports PEP 621 metadata"
@@ -27,15 +27,15 @@ optdepends=(
)
source=(
https://files.pythonhosted.org/packages/source/${_name::1}/$_name/$_name-$pkgver.tar.gz
- $pkgname-1.0.2-devendor.patch
+ $pkgname-1.0.3-devendor.patch
)
-sha512sums=('c8c7a201dd08e8def56cb133874c3ee0ea6a9d1bf89141db125e9b5426bc00f0fc3eac37c32fef8cb4e2598981c3f764169dd1e55d886124db2e97a5a4ee229a'
- '7ce53fd5e39891aee5a20ad34f6bc55534b5a1a34949885029b1740201049f23235e8f7d18cb427518c5e9d20326f1cdf5f463a82eaec2d442aa7cad3732ff66')
-b2sums=('2a7597d706d1d96f9923db7e9c90210180c9da8f643aca18c6c636149d0e5d6c11df060766351b76895003326c1ea171fb085f9c93fe7be5dce9d34fbb1701fa'
- '8025738bd56df56d50e6fc131f30115a345740d8ffc9b07e4a1cc5595ca4984ea47a6aa5549e4b4b85ca2a0ed0372072b66b509481d1450f0f6a4910696a450e')
+sha512sums=('104f6bff2c0c951c7959b98e8d37d58ead11d00e35bbeb804e23146dcd55afc1b11bc8017aaecf11e20a2f532b1fb8374ea744f83c7b50c380e1aee519855b06'
+ '47afbb9611780e77000ea488f5ca061e4c41e8811490c32282fd19f9e792fa97e1395912cbd2afd92f56dbf34f31e3b31a6ae7ddf05399a141d03539ddd1b966')
+b2sums=('f4a69ed2073e3003124aefe23065ba9551fe699b9c953a1e07f7c334c3ed82fe9422f8279d379c617de99295b26e78d901a01333b7b0a56736c487b44fff8f35'
+ 'ffb106b5ce6ab17952c34b6a2aeb57b699fcaef762fe46fe16e8474250282d931fb4a383ba963b20c0af1c34702a260dd522f98fcdb40dd6dc6dd5f7bc8b3f96')
prepare() {
- patch -Np1 -d $_name-$pkgver -i ../$pkgname-1.0.2-devendor.patch
+ patch -Np1 -d $_name-$pkgver -i ../$pkgname-1.0.3-devendor.patch
rm -frv $_name-$pkgver/pdm/pep517/_vendor
}
diff --git a/python-pdm-pep517-1.0.2-devendor.patch b/python-pdm-pep517-1.0.3-devendor.patch
index 7f329a34721c..64bdcb034804 100644
--- a/python-pdm-pep517-1.0.2-devendor.patch
+++ b/python-pdm-pep517-1.0.3-devendor.patch
@@ -1,9 +1,9 @@
diff -ruN a/pdm/pep517/base.py b/pdm/pep517/base.py
---- a/pdm/pep517/base.py 2022-07-10 07:00:32.663631000 +0200
-+++ b/pdm/pep517/base.py 2022-07-21 10:42:50.692079277 +0200
-@@ -6,7 +6,7 @@
- from pathlib import Path
- from typing import Any, Dict, Iterator, List, Mapping, Optional, Tuple, TypeVar, Union
+--- a/pdm/pep517/base.py 2022-07-27 11:27:54.656356800 +0200
++++ b/pdm/pep517/base.py 2022-07-31 13:26:24.019307059 +0200
+@@ -16,7 +16,7 @@
+ cast,
+ )
-from pdm.pep517._vendor import tomli
+import tomli
@@ -11,8 +11,8 @@ diff -ruN a/pdm/pep517/base.py b/pdm/pep517/base.py
from pdm.pep517.metadata import Metadata
from pdm.pep517.utils import is_python_package, safe_version, to_filename
diff -ruN a/pdm/pep517/license.py b/pdm/pep517/license.py
---- a/pdm/pep517/license.py 2022-07-10 07:00:32.663631000 +0200
-+++ b/pdm/pep517/license.py 2022-07-21 10:41:41.322359486 +0200
+--- a/pdm/pep517/license.py 2022-07-27 11:27:54.656356800 +0200
++++ b/pdm/pep517/license.py 2022-07-31 13:25:33.246739048 +0200
@@ -1,6 +1,6 @@
import warnings
@@ -22,8 +22,8 @@ diff -ruN a/pdm/pep517/license.py b/pdm/pep517/license.py
Licensing,
get_spdx_licensing,
diff -ruN a/pdm/pep517/metadata.py b/pdm/pep517/metadata.py
---- a/pdm/pep517/metadata.py 2022-07-10 07:00:32.663631000 +0200
-+++ b/pdm/pep517/metadata.py 2022-07-21 10:43:29.681922662 +0200
+--- a/pdm/pep517/metadata.py 2022-07-27 11:27:54.656356800 +0200
++++ b/pdm/pep517/metadata.py 2022-07-31 13:25:51.176463253 +0200
@@ -16,7 +16,7 @@
cast,
)
@@ -34,10 +34,10 @@ diff -ruN a/pdm/pep517/metadata.py b/pdm/pep517/metadata.py
from pdm.pep517.license import normalize_expression
from pdm.pep517.utils import (
diff -ruN a/pdm/pep517/scm.py b/pdm/pep517/scm.py
---- a/pdm/pep517/scm.py 2022-07-10 07:00:32.663631000 +0200
-+++ b/pdm/pep517/scm.py 2022-07-21 10:43:11.761994569 +0200
-@@ -11,8 +11,8 @@
- from datetime import datetime
+--- a/pdm/pep517/scm.py 2022-07-27 11:27:54.656356800 +0200
++++ b/pdm/pep517/scm.py 2022-07-31 13:26:08.436203529 +0200
+@@ -12,8 +12,8 @@
+ from pathlib import Path
from typing import Any, Dict, Iterable, List, NamedTuple, Optional, Tuple, Union
-from pdm.pep517._vendor.packaging.version import LegacyVersion, Version
@@ -48,8 +48,8 @@ diff -ruN a/pdm/pep517/scm.py b/pdm/pep517/scm.py
DEFAULT_TAG_REGEX = re.compile(
r"^(?:[\w-]+-)?(?P<version>[vV]?\d+(?:\.\d+){0,2}[^\+]*)(?:\+.*)?$"
diff -ruN a/pdm/pep517/sdist.py b/pdm/pep517/sdist.py
---- a/pdm/pep517/sdist.py 2022-07-10 07:00:32.663631000 +0200
-+++ b/pdm/pep517/sdist.py 2022-07-21 10:41:22.852434458 +0200
+--- a/pdm/pep517/sdist.py 2022-07-27 11:27:54.656356800 +0200
++++ b/pdm/pep517/sdist.py 2022-07-31 13:23:59.144962088 +0200
@@ -6,7 +6,8 @@
from copy import copy
from typing import Any, Iterator
@@ -61,8 +61,8 @@ diff -ruN a/pdm/pep517/sdist.py b/pdm/pep517/sdist.py
diff -ruN a/pdm/pep517/utils.py b/pdm/pep517/utils.py
---- a/pdm/pep517/utils.py 2022-07-10 07:00:32.663631000 +0200
-+++ b/pdm/pep517/utils.py 2022-07-21 10:42:32.178820523 +0200
+--- a/pdm/pep517/utils.py 2022-07-27 11:27:54.656356800 +0200
++++ b/pdm/pep517/utils.py 2022-07-31 13:25:11.207086734 +0200
@@ -9,10 +9,10 @@
from pathlib import Path
from typing import Callable, Generator, Iterable, Optional, Type, Union
@@ -79,8 +79,8 @@ diff -ruN a/pdm/pep517/utils.py b/pdm/pep517/utils.py
from pdm.pep517.macosx_platform import calculate_macosx_platform_tag
diff -ruN a/pdm/pep517/validator.py b/pdm/pep517/validator.py
---- a/pdm/pep517/validator.py 2022-07-10 07:00:32.663631000 +0200
-+++ b/pdm/pep517/validator.py 2022-07-21 10:40:22.092682287 +0200
+--- a/pdm/pep517/validator.py 2022-07-27 11:27:54.656356800 +0200
++++ b/pdm/pep517/validator.py 2022-07-31 13:24:51.554071825 +0200
@@ -1,6 +1,6 @@
from typing import Mapping
@@ -90,8 +90,8 @@ diff -ruN a/pdm/pep517/validator.py b/pdm/pep517/validator.py
README_RULE = [
diff -ruN a/pdm/pep517/wheel.py b/pdm/pep517/wheel.py
---- a/pdm/pep517/wheel.py 2022-07-10 07:00:32.663631000 +0200
-+++ b/pdm/pep517/wheel.py 2022-07-21 10:40:53.322554669 +0200
+--- a/pdm/pep517/wheel.py 2022-07-27 11:27:54.656356800 +0200
++++ b/pdm/pep517/wheel.py 2022-07-31 13:24:27.554471866 +0200
@@ -16,8 +16,8 @@
from typing import Any, Dict, Generator, List, Mapping, Optional, TextIO, Tuple, Union
@@ -103,27 +103,9 @@ diff -ruN a/pdm/pep517/wheel.py b/pdm/pep517/wheel.py
from pdm.pep517.base import Builder
from pdm.pep517.exceptions import BuildError, PDMWarning
from pdm.pep517.utils import get_abi_tag, get_platform, show_warning
-diff -ruN a/pyproject.toml b/pyproject.toml
---- a/pyproject.toml 2022-07-10 07:00:32.663631000 +0200
-+++ b/pyproject.toml 2022-07-21 10:46:41.084494800 +0200
-@@ -21,7 +21,13 @@
- "Programming Language :: Python :: 3.9",
- "Programming Language :: Python :: 3.10",
- ]
--dependencies = []
-+dependencies = [
-+ "cerberus",
-+ "license-expression",
-+ "packaging",
-+ "tomli",
-+ "tomli-w",
-+]
- version = "1.0.2"
-
- [project.license]
diff -ruN a/tests/test_metadata.py b/tests/test_metadata.py
---- a/tests/test_metadata.py 2022-07-10 07:00:32.667631100 +0200
-+++ b/tests/test_metadata.py 2022-07-21 10:42:05.778927122 +0200
+--- a/tests/test_metadata.py 2022-07-27 11:27:54.660356800 +0200
++++ b/tests/test_metadata.py 2022-07-31 13:26:38.082436718 +0200
@@ -5,7 +5,7 @@
import pytest