Upgrade to 1.0.5.

Update devendoring patch.
Add a custom variable to switch off vendoring if needed.

2 files changed, 48 insertions, 42 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 2067fe27b16d..ea1d64cf2f42 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,12 @@
 # Maintainer: David Runge <dvzrv@archlinux.org>
 
+# set to 0 to use vendored sources
+_devendored=1
 _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.4
+pkgver=1.0.5
 pkgrel=1
 epoch=1
 pkgdesc="A PEP 517 backend for PDM that supports PEP 621 metadata"
@@ -12,14 +14,16 @@ arch=(any)
 url="https://github.com/pdm-project/pdm-pep517"
 license=(MIT)
 depends=(python)
-# NOTE devendored from sources
-depends+=(
-  python-cerberus
-  python-license-expression
-  python-packaging
-  python-tomli
-  python-tomli-w
-)
+if (( $_devendored == 1 )); then
+  # NOTE devendored from sources
+  depends+=(
+    python-cerberus
+    python-license-expression
+    python-packaging
+    python-tomli
+    python-tomli-w
+  )
+fi
 makedepends=(python-build python-installer)
 checkdepends=(git python-pytest python-setuptools)
 optdepends=(
@@ -27,16 +31,18 @@ optdepends=(
 )
 source=(
   https://files.pythonhosted.org/packages/source/${_name::1}/$_name/$_name-$pkgver.tar.gz
-  $pkgname-1.0.4-devendor.patch
+  $pkgname-1.0.5-devendor.patch
 )
-sha512sums=('5d69b7b18dc28ff2dcccee6ecb39e9dda2c7b7cf5a012509593963bfa09dee15c284b971232243f7929d513f290098c9d833a9b61a666c98add8071f90ff9f7e'
-            '905c249c87e411890fcaa26203ee42ed30c9fb7b7037196bcc8d3201073c93726beb282a98230e7c9b4ef78be233257c585f603b302e43923db596a869889109')
-b2sums=('f1c7697912308091565977dd10958001ba5ede8a894298ff4934c2889cf87088c3efab731500f1e62f23fbfbea02a4aa9ec90c527e47161a00408c9773a42596'
-        '9c4ce22ce832b85d4e1a7690bfd1dd7752f1176f6602be1b9c012750ce10d7f4302209d20e0c67061974a82af10babbf9ee158088d4cfe238caad584eef661b2')
+sha512sums=('c7719c9836d449b301ec28b781c744b05648f517d3c4392f6fa25e58bb54979a3740ce074eda293651cfbe9b9f9d780ec28bf37737076855d9be3cfdd81816f9'
+            '0158c486ebb668b7e48b450d50a8223d45776517e868dd85c322d29cd925acd3e2e28782796a16e137dcc38312bce753535ba7c71ced58f8d5dd74ddb41701c0')
+b2sums=('a1d6ae0aecfcc459683d6f92869557fbc7dac2425e85d87c777a39abef079028074524a94153709cf5a6b92850ffe156378e0fe622e2fda23f688cf2a7a912df'
+        '4b20b48d9eeac1bb397eec1c98400a9f70aa576689c1cefb33e31dd86f128f30c51be759bb8ede3a2c26ec65055020e3decee7d1b42d67720902db9e6b13cd42')
 
 prepare() {
-  patch -Np1 -d $_name-$pkgver -i ../$pkgname-1.0.4-devendor.patch
-  rm -frv $_name-$pkgver/pdm/pep517/_vendor
+  if (( $_devendored == 1 )); then
+    patch -Np1 -d $_name-$pkgver -i ../$pkgname-1.0.5-devendor.patch
+    rm -frv $_name-$pkgver/pdm/pep517/_vendor
+  fi
 }
 
 build() {
diff --git a/python-pdm-pep517-1.0.4-devendor.patch b/python-pdm-pep517-1.0.5-devendor.patch
index bc92ac27658c..b8637dd0af8e 100644
--- a/python-pdm-pep517-1.0.4-devendor.patch
+++ b/python-pdm-pep517-1.0.5-devendor.patch
@@ -1,6 +1,6 @@
 diff -ruN a/pdm/pep517/base.py b/pdm/pep517/base.py
---- a/pdm/pep517/base.py	2022-08-06 17:29:41.927385300 +0200
-+++ b/pdm/pep517/base.py	2022-08-23 17:45:23.391722696 +0200
+--- a/pdm/pep517/base.py	2022-10-24 04:00:28.909448900 +0200
++++ b/pdm/pep517/base.py	2022-10-31 19:03:59.193340376 +0100
 @@ -7,7 +7,7 @@
  from pathlib import Path
  from typing import Any, Iterator, Mapping, TypeVar, cast
@@ -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-08-06 17:29:41.927385300 +0200
-+++ b/pdm/pep517/license.py	2022-08-23 17:45:23.391722696 +0200
+--- a/pdm/pep517/license.py	2022-10-24 04:00:28.909448900 +0200
++++ b/pdm/pep517/license.py	2022-10-31 19:03:59.193340376 +0100
 @@ -1,6 +1,6 @@
  import warnings
  
@@ -22,20 +22,20 @@ 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-08-06 17:29:41.927385300 +0200
-+++ b/pdm/pep517/metadata.py	2022-08-23 17:45:23.391722696 +0200
+--- a/pdm/pep517/metadata.py	2022-10-24 04:00:28.909448900 +0200
++++ b/pdm/pep517/metadata.py	2022-10-31 19:21:03.621468652 +0100
 @@ -5,7 +5,7 @@
  from pathlib import Path
  from typing import Any, Callable, Generic, Iterable, Mapping, TypeVar, cast
  
--from pdm.pep517._vendor.packaging.requirements import Requirement
-+from packaging.requirements import Requirement
+-from pdm.pep517._vendor.packaging.requirements import InvalidRequirement, Requirement
++from packaging.requirements import InvalidRequirement, Requirement
  from pdm.pep517.exceptions import MetadataError, PDMWarning, ProjectError
- from pdm.pep517.license import normalize_expression
  from pdm.pep517.utils import (
+     cd,
 diff -ruN a/pdm/pep517/scm.py b/pdm/pep517/scm.py
---- a/pdm/pep517/scm.py	2022-08-06 17:29:41.931385300 +0200
-+++ b/pdm/pep517/scm.py	2022-08-23 17:45:23.391722696 +0200
+--- a/pdm/pep517/scm.py	2022-10-24 04:00:28.909448900 +0200
++++ b/pdm/pep517/scm.py	2022-10-31 19:03:59.193340376 +0100
 @@ -14,8 +14,8 @@
  from pathlib import Path
  from typing import Any, Iterable, NamedTuple
@@ -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-08-06 17:29:41.931385300 +0200
-+++ b/pdm/pep517/sdist.py	2022-08-23 17:45:23.391722696 +0200
+--- a/pdm/pep517/sdist.py	2022-10-24 04:00:28.909448900 +0200
++++ b/pdm/pep517/sdist.py	2022-10-31 19:03:59.193340376 +0100
 @@ -6,7 +6,8 @@
  from copy import copy
  from typing import Any, Iterator
@@ -61,26 +61,26 @@ 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-08-06 17:29:41.931385300 +0200
-+++ b/pdm/pep517/utils.py	2022-08-23 17:45:23.391722696 +0200
-@@ -11,10 +11,10 @@
+--- a/pdm/pep517/utils.py	2022-10-24 04:00:28.909448900 +0200
++++ b/pdm/pep517/utils.py	2022-10-31 19:21:55.245026206 +0100
+@@ -12,10 +12,10 @@
  from pathlib import Path
- from typing import Callable, Generator, Iterable
+ from typing import Callable, Generator, Iterable, Match
  
 -from pdm.pep517._vendor.packaging import tags
 -from pdm.pep517._vendor.packaging.markers import Marker
--from pdm.pep517._vendor.packaging.requirements import InvalidRequirement, Requirement
+-from pdm.pep517._vendor.packaging.requirements import Requirement
 -from pdm.pep517._vendor.packaging.version import InvalidVersion, Version
 +from packaging import tags
 +from packaging.markers import Marker
-+from packaging.requirements import InvalidRequirement, Requirement
++from packaging.requirements import Requirement
 +from packaging.version import InvalidVersion, Version
- from pdm.pep517.exceptions import MetadataError
  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-08-06 17:29:41.931385300 +0200
-+++ b/pdm/pep517/validator.py	2022-08-23 17:45:23.391722696 +0200
+--- a/pdm/pep517/validator.py	2022-10-24 04:00:28.909448900 +0200
++++ b/pdm/pep517/validator.py	2022-10-31 19:03:59.196673721 +0100
 @@ -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-08-06 17:29:41.931385300 +0200
-+++ b/pdm/pep517/wheel.py	2022-08-23 17:45:23.391722696 +0200
+--- a/pdm/pep517/wheel.py	2022-10-24 04:00:28.909448900 +0200
++++ b/pdm/pep517/wheel.py	2022-10-31 19:03:59.196673721 +0100
 @@ -19,8 +19,8 @@
  from typing import Any, BinaryIO, Generator, Mapping, NamedTuple, TextIO
  
@@ -104,8 +104,8 @@ diff -ruN a/pdm/pep517/wheel.py b/pdm/pep517/wheel.py
  from pdm.pep517.exceptions import BuildError, PDMWarning
  from pdm.pep517.utils import get_abi_tag, get_platform, show_warning
 diff -ruN a/tests/test_metadata.py b/tests/test_metadata.py
---- a/tests/test_metadata.py	2022-08-06 17:29:41.935385500 +0200
-+++ b/tests/test_metadata.py	2022-08-23 17:45:23.391722696 +0200
+--- a/tests/test_metadata.py	2022-10-24 04:00:28.913448800 +0200
++++ b/tests/test_metadata.py	2022-10-31 19:03:59.196673721 +0100
 @@ -5,7 +5,7 @@
  
  import pytest