[arch-commits] Commit in python-pdm-pep517/repos/community-staging-any (7 files)

David Runge dvzrv at gemini.archlinux.org
Wed Jun 29 18:50:15 UTC 2022


    Date: Wednesday, June 29, 2022 @ 18:50:15
  Author: dvzrv
Revision: 1241092

archrelease: copy trunk to community-staging-any

Added:
  python-pdm-pep517/repos/community-staging-any/PKGBUILD
    (from rev 1241091, python-pdm-pep517/trunk/PKGBUILD)
  python-pdm-pep517/repos/community-staging-any/python-pdm-pep517-0.12.5-devendor.patch
    (from rev 1241091, python-pdm-pep517/trunk/python-pdm-pep517-0.12.5-devendor.patch)
  python-pdm-pep517/repos/community-staging-any/python-pdm-pep517-0.12.7-devendor.patch
    (from rev 1241091, python-pdm-pep517/trunk/python-pdm-pep517-0.12.7-devendor.patch)
  python-pdm-pep517/repos/community-staging-any/python-pdm-pep517-1.0.0-devendor.patch
    (from rev 1241091, python-pdm-pep517/trunk/python-pdm-pep517-1.0.0-devendor.patch)
Deleted:
  python-pdm-pep517/repos/community-staging-any/PKGBUILD
  python-pdm-pep517/repos/community-staging-any/python-pdm-pep517-0.12.5-devendor.patch
  python-pdm-pep517/repos/community-staging-any/python-pdm-pep517-1.0.0-devendor.patch

-----------------------------------------+
 PKGBUILD                                |  116 +++++++------
 python-pdm-pep517-0.12.5-devendor.patch |  214 ++++++++++++------------
 python-pdm-pep517-0.12.7-devendor.patch |  107 ++++++++++++
 python-pdm-pep517-1.0.0-devendor.patch  |  258 +++++++++++++++---------------
 4 files changed, 405 insertions(+), 290 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-06-29 18:50:04 UTC (rev 1241091)
+++ PKGBUILD	2022-06-29 18:50:15 UTC (rev 1241092)
@@ -1,54 +0,0 @@
-# Maintainer: David Runge <dvzrv at archlinux.org>
-
-_name=pdm-pep517
-pkgname=python-pdm-pep517
-pkgver=1.0.0
-pkgrel=1
-pkgdesc="A PEP 517 backend for PDM that supports PEP 621 metadata"
-arch=(any)
-url="https://github.com/pdm-project/pdm-pep517"
-license=(MIT)
-depends=(python-boolean.py python-cerberus python-license-expression python-packaging python-pyparsing python-tomli python-tomli-w)
-makedepends=(python-build python-installer)
-checkdepends=(git python-pytest python-setuptools)
-optdepends=(
-  'python-setuptools: for setuptools support'
-)
-source=(
-  https://files.pythonhosted.org/packages/source/${_name::1}/$_name/$_name-$pkgver.tar.gz
-  $pkgname-1.0.0-devendor.patch
-)
-sha512sums=('7dc0d2954d1804f6e013537ef33ef0f90498f4036dcd87d75a33fa443cbe9cfe3432c8d087b84498acbd23391d4aeab0e43c53055d4745ad105e9e6767531aeb'
-            '3a37894a930896cd99f526b79645a46e79f8a5d83e3f20493acdbc7be8185ee3e4780ba60fc5b2c97d3d4e1ae4378b49a5d099deabc9b998720f37387ae537af')
-b2sums=('8f1165adbc25e9fe2a41d9cd62cf4f5d6f687b0ee8a72e22b3c3664eabcd115176e63556335f4888d61f05b5922bff5a4ba1caf3fe2a61e3c928eb79c3acb9ae'
-        'fdf9743958ba8b748dddb432ccad8a2a2c09266a1130bdd259c27e342a4830d215e99bf6e756aa0d3279f26706cce7063d781c489fe1ddb7ea637195a509f454')
-
-prepare() {
-  cd $_name-$pkgver
-  # remove vendoring of python-boolean.py, python-cerberus,
-  # python-license-expression, python-packaging, python-pyparsing,
-  # python-tomli, python-tomli-w
-  patch -Np1 -i ../$pkgname-1.0.0-devendor.patch
-  rm -frv pdm/pep517/_vendor
-}
-
-build() {
-  cd $_name-$pkgver
-  python -m build --wheel --skip-dependency-check --no-isolation
-}
-
-check() {
-  cd $_name-$pkgver
-
-  # set default git config for test
-  git config --global user.email "you at example.com"
-  git config --global user.name "Your Name"
-  pytest -vv
-}
-
-package() {
-  cd $_name-$pkgver
-  python -m installer --destdir="$pkgdir" dist/*.whl
-  install -vDm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
-  install -vDm 644 README.md -t "$pkgdir/usr/share/doc/$pkgname/"
-}

Copied: python-pdm-pep517/repos/community-staging-any/PKGBUILD (from rev 1241091, python-pdm-pep517/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-06-29 18:50:15 UTC (rev 1241092)
@@ -0,0 +1,62 @@
+# Maintainer: David Runge <dvzrv at archlinux.org>
+
+_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=0.12.7
+pkgrel=1
+epoch=1
+pkgdesc="A PEP 517 backend for PDM that supports PEP 621 metadata"
+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
+)
+makedepends=(python-build python-installer)
+checkdepends=(git python-pytest python-setuptools)
+optdepends=(
+  'python-setuptools: for setuptools support'
+)
+source=(
+  https://files.pythonhosted.org/packages/source/${_name::1}/$_name/$_name-$pkgver.tar.gz
+  $pkgname-0.12.7-devendor.patch
+)
+sha512sums=('4b3e40084c3bb4e3206fc00a98e24e28d46ec5efd4b76efebd4d03c7864a3cdefcc7cd429c4d5688a84f298738b8268f79e2ce7082421f539aff03cbe7d0c393'
+            '7605bb15e16bde3807d97b6c3ff6359a40a5fd84adecfc53303938245c5c9704329fe59b0d32dbecf328895c44f5a04340e25560c8ec8d7511125fbc32a2590c')
+b2sums=('4e405e897a27eb83b837d0b4b7bc73ba5e79d9d2c66ceabd03cf712a4b5bfdb31be58c5a78aee64f32b819cb63908ac360b91758715f014c4a7d45954bdff96e'
+        '7c7b462b325b080e3cd4141beff1870b310919b5f3d7e11878c2242f822ffca66e8b01007762afc158a6013a737798f4946646b44b36cdc7a236e8b2c10adbe7')
+
+prepare() {
+  cd $_name-$pkgver
+  patch -Np1 -i ../$pkgname-0.12.7-devendor.patch
+  rm -frv pdm/pep517/_vendor
+}
+
+build() {
+  cd $_name-$pkgver
+  python -m build --wheel --skip-dependency-check --no-isolation
+}
+
+check() {
+  cd $_name-$pkgver
+
+  # set default git config for test
+  git config --global user.email "you at example.com"
+  git config --global user.name "Your Name"
+  pytest -vv
+}
+
+package() {
+  cd $_name-$pkgver
+  python -m installer --destdir="$pkgdir" dist/*.whl
+  install -vDm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
+  install -vDm 644 README.md -t "$pkgdir/usr/share/doc/$pkgname/"
+}

Deleted: python-pdm-pep517-0.12.5-devendor.patch
===================================================================
--- python-pdm-pep517-0.12.5-devendor.patch	2022-06-29 18:50:04 UTC (rev 1241091)
+++ python-pdm-pep517-0.12.5-devendor.patch	2022-06-29 18:50:15 UTC (rev 1241092)
@@ -1,107 +0,0 @@
-diff -ruN a/pdm/pep517/license.py b/pdm/pep517/license.py
---- a/pdm/pep517/license.py	2022-05-16 11:54:15.121063500 +0200
-+++ b/pdm/pep517/license.py	2022-05-20 20:20:14.141378129 +0200
-@@ -1,6 +1,6 @@
- import warnings
- 
--from pdm.pep517._vendor.license_expression import (
-+from license_expression import (
-     LicenseSymbol,
-     Licensing,
-     get_spdx_licensing,
-diff -ruN a/pdm/pep517/metadata.py b/pdm/pep517/metadata.py
---- a/pdm/pep517/metadata.py	2022-05-16 11:54:15.121063500 +0200
-+++ b/pdm/pep517/metadata.py	2022-05-20 20:20:14.148044828 +0200
-@@ -17,8 +17,8 @@
-     Union,
- )
- 
--from pdm.pep517._vendor import tomli
--from pdm.pep517._vendor.packaging.requirements import Requirement
-+import tomli
-+from packaging.requirements import Requirement
- from pdm.pep517.exceptions import MetadataError, PDMWarning, ProjectError
- from pdm.pep517.license import normalize_expression
- from pdm.pep517.scm import get_version_from_scm
-diff -ruN a/pdm/pep517/scm.py b/pdm/pep517/scm.py
---- a/pdm/pep517/scm.py	2022-05-16 11:54:15.121063500 +0200
-+++ b/pdm/pep517/scm.py	2022-05-20 20:20:14.148044828 +0200
-@@ -11,8 +11,8 @@
- from datetime import datetime
- from typing import Any, Dict, Iterable, List, NamedTuple, Optional, Tuple, Union
- 
--from pdm.pep517._vendor.packaging.version import LegacyVersion, Version
--from pdm.pep517._vendor.packaging.version import parse as parse_version
-+from packaging.version import LegacyVersion, Version
-+from packaging.version import parse as parse_version
- 
- 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-05-16 11:54:15.121063500 +0200
-+++ b/pdm/pep517/sdist.py	2022-05-20 20:20:14.148044828 +0200
-@@ -6,7 +6,8 @@
- from copy import copy
- from typing import Any, Iterator
- 
--from pdm.pep517._vendor import tomli, tomli_w
-+import tomli
-+import tomli_w
- from pdm.pep517.base import Builder
- 
- 
-diff -ruN a/pdm/pep517/utils.py b/pdm/pep517/utils.py
---- a/pdm/pep517/utils.py	2022-05-16 11:54:15.121063500 +0200
-+++ b/pdm/pep517/utils.py	2022-05-20 20:20:14.148044828 +0200
-@@ -8,10 +8,10 @@
- from pathlib import Path
- from typing import Callable, Generator, Iterable, Optional, Union
- 
--from pdm.pep517._vendor.packaging import tags
--from pdm.pep517._vendor.packaging.markers import Marker
--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 Requirement
-+from packaging.version import InvalidVersion, Version
- 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-05-16 11:54:15.121063500 +0200
-+++ b/pdm/pep517/validator.py	2022-05-20 20:20:14.148044828 +0200
-@@ -1,6 +1,6 @@
- from typing import Mapping
- 
--from pdm.pep517._vendor import cerberus
-+import cerberus
- from pdm.pep517.exceptions import PEP621ValidationError
- 
- README_RULE = [
-diff -ruN a/pdm/pep517/wheel.py b/pdm/pep517/wheel.py
---- a/pdm/pep517/wheel.py	2022-05-16 11:54:15.121063500 +0200
-+++ b/pdm/pep517/wheel.py	2022-05-20 20:20:14.148044828 +0200
-@@ -15,8 +15,8 @@
- from typing import Any, Generator, List, Mapping, Optional, TextIO, Tuple, Union
- 
- from pdm.pep517 import __version__
--from pdm.pep517._vendor.packaging import tags
--from pdm.pep517._vendor.packaging.specifiers import SpecifierSet
-+from packaging import tags
-+from packaging.specifiers import SpecifierSet
- from pdm.pep517.base import Builder
- from pdm.pep517.exceptions import BuildError
- from pdm.pep517.utils import get_abi_tag, get_platform
-diff -ruN a/pyproject.toml b/pyproject.toml
---- a/pyproject.toml	2022-05-16 11:54:15.121063500 +0200
-+++ b/pyproject.toml	2022-05-20 20:20:35.858146674 +0200
-@@ -21,7 +21,7 @@
-     "Programming Language :: Python :: 3.9",
-     "Programming Language :: Python :: 3.10",
- ]
--dependencies = []
-+dependencies = ["boolean.py", "cerberus", "license_expression", "packaging", "pyparsing", "tomli", "tomli_w"]
- version = "0.12.5"
- 
- [project.license]

Copied: python-pdm-pep517/repos/community-staging-any/python-pdm-pep517-0.12.5-devendor.patch (from rev 1241091, python-pdm-pep517/trunk/python-pdm-pep517-0.12.5-devendor.patch)
===================================================================
--- python-pdm-pep517-0.12.5-devendor.patch	                        (rev 0)
+++ python-pdm-pep517-0.12.5-devendor.patch	2022-06-29 18:50:15 UTC (rev 1241092)
@@ -0,0 +1,107 @@
+diff -ruN a/pdm/pep517/license.py b/pdm/pep517/license.py
+--- a/pdm/pep517/license.py	2022-05-16 11:54:15.121063500 +0200
++++ b/pdm/pep517/license.py	2022-05-20 20:20:14.141378129 +0200
+@@ -1,6 +1,6 @@
+ import warnings
+ 
+-from pdm.pep517._vendor.license_expression import (
++from license_expression import (
+     LicenseSymbol,
+     Licensing,
+     get_spdx_licensing,
+diff -ruN a/pdm/pep517/metadata.py b/pdm/pep517/metadata.py
+--- a/pdm/pep517/metadata.py	2022-05-16 11:54:15.121063500 +0200
++++ b/pdm/pep517/metadata.py	2022-05-20 20:20:14.148044828 +0200
+@@ -17,8 +17,8 @@
+     Union,
+ )
+ 
+-from pdm.pep517._vendor import tomli
+-from pdm.pep517._vendor.packaging.requirements import Requirement
++import tomli
++from packaging.requirements import Requirement
+ from pdm.pep517.exceptions import MetadataError, PDMWarning, ProjectError
+ from pdm.pep517.license import normalize_expression
+ from pdm.pep517.scm import get_version_from_scm
+diff -ruN a/pdm/pep517/scm.py b/pdm/pep517/scm.py
+--- a/pdm/pep517/scm.py	2022-05-16 11:54:15.121063500 +0200
++++ b/pdm/pep517/scm.py	2022-05-20 20:20:14.148044828 +0200
+@@ -11,8 +11,8 @@
+ from datetime import datetime
+ from typing import Any, Dict, Iterable, List, NamedTuple, Optional, Tuple, Union
+ 
+-from pdm.pep517._vendor.packaging.version import LegacyVersion, Version
+-from pdm.pep517._vendor.packaging.version import parse as parse_version
++from packaging.version import LegacyVersion, Version
++from packaging.version import parse as parse_version
+ 
+ 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-05-16 11:54:15.121063500 +0200
++++ b/pdm/pep517/sdist.py	2022-05-20 20:20:14.148044828 +0200
+@@ -6,7 +6,8 @@
+ from copy import copy
+ from typing import Any, Iterator
+ 
+-from pdm.pep517._vendor import tomli, tomli_w
++import tomli
++import tomli_w
+ from pdm.pep517.base import Builder
+ 
+ 
+diff -ruN a/pdm/pep517/utils.py b/pdm/pep517/utils.py
+--- a/pdm/pep517/utils.py	2022-05-16 11:54:15.121063500 +0200
++++ b/pdm/pep517/utils.py	2022-05-20 20:20:14.148044828 +0200
+@@ -8,10 +8,10 @@
+ from pathlib import Path
+ from typing import Callable, Generator, Iterable, Optional, Union
+ 
+-from pdm.pep517._vendor.packaging import tags
+-from pdm.pep517._vendor.packaging.markers import Marker
+-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 Requirement
++from packaging.version import InvalidVersion, Version
+ 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-05-16 11:54:15.121063500 +0200
++++ b/pdm/pep517/validator.py	2022-05-20 20:20:14.148044828 +0200
+@@ -1,6 +1,6 @@
+ from typing import Mapping
+ 
+-from pdm.pep517._vendor import cerberus
++import cerberus
+ from pdm.pep517.exceptions import PEP621ValidationError
+ 
+ README_RULE = [
+diff -ruN a/pdm/pep517/wheel.py b/pdm/pep517/wheel.py
+--- a/pdm/pep517/wheel.py	2022-05-16 11:54:15.121063500 +0200
++++ b/pdm/pep517/wheel.py	2022-05-20 20:20:14.148044828 +0200
+@@ -15,8 +15,8 @@
+ from typing import Any, Generator, List, Mapping, Optional, TextIO, Tuple, Union
+ 
+ from pdm.pep517 import __version__
+-from pdm.pep517._vendor.packaging import tags
+-from pdm.pep517._vendor.packaging.specifiers import SpecifierSet
++from packaging import tags
++from packaging.specifiers import SpecifierSet
+ from pdm.pep517.base import Builder
+ from pdm.pep517.exceptions import BuildError
+ from pdm.pep517.utils import get_abi_tag, get_platform
+diff -ruN a/pyproject.toml b/pyproject.toml
+--- a/pyproject.toml	2022-05-16 11:54:15.121063500 +0200
++++ b/pyproject.toml	2022-05-20 20:20:35.858146674 +0200
+@@ -21,7 +21,7 @@
+     "Programming Language :: Python :: 3.9",
+     "Programming Language :: Python :: 3.10",
+ ]
+-dependencies = []
++dependencies = ["boolean.py", "cerberus", "license_expression", "packaging", "pyparsing", "tomli", "tomli_w"]
+ version = "0.12.5"
+ 
+ [project.license]

Copied: python-pdm-pep517/repos/community-staging-any/python-pdm-pep517-0.12.7-devendor.patch (from rev 1241091, python-pdm-pep517/trunk/python-pdm-pep517-0.12.7-devendor.patch)
===================================================================
--- python-pdm-pep517-0.12.7-devendor.patch	                        (rev 0)
+++ python-pdm-pep517-0.12.7-devendor.patch	2022-06-29 18:50:15 UTC (rev 1241092)
@@ -0,0 +1,107 @@
+diff -ruN a/pdm/pep517/license.py b/pdm/pep517/license.py
+--- a/pdm/pep517/license.py	2022-06-08 10:21:35.115564000 +0200
++++ b/pdm/pep517/license.py	2022-06-29 20:39:54.764088325 +0200
+@@ -1,6 +1,6 @@
+ import warnings
+ 
+-from pdm.pep517._vendor.license_expression import (
++from license_expression import (
+     LicenseSymbol,
+     Licensing,
+     get_spdx_licensing,
+diff -ruN a/pdm/pep517/metadata.py b/pdm/pep517/metadata.py
+--- a/pdm/pep517/metadata.py	2022-06-08 10:21:35.115564000 +0200
++++ b/pdm/pep517/metadata.py	2022-06-29 20:37:50.848253022 +0200
+@@ -17,8 +17,8 @@
+     Union,
+ )
+ 
+-from pdm.pep517._vendor import tomli
+-from pdm.pep517._vendor.packaging.requirements import Requirement
++import tomli
++from packaging.requirements import Requirement
+ from pdm.pep517.exceptions import MetadataError, PDMWarning, ProjectError
+ from pdm.pep517.license import normalize_expression
+ from pdm.pep517.scm import get_version_from_scm
+diff -ruN a/pdm/pep517/scm.py b/pdm/pep517/scm.py
+--- a/pdm/pep517/scm.py	2022-06-08 10:21:35.115564000 +0200
++++ b/pdm/pep517/scm.py	2022-06-29 20:38:12.024778437 +0200
+@@ -11,8 +11,8 @@
+ from datetime import datetime
+ from typing import Any, Dict, Iterable, List, NamedTuple, Optional, Tuple, Union
+ 
+-from pdm.pep517._vendor.packaging.version import LegacyVersion, Version
+-from pdm.pep517._vendor.packaging.version import parse as parse_version
++from packaging.version import LegacyVersion, Version
++from packaging.version import parse as parse_version
+ 
+ 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-06-08 10:21:35.115564000 +0200
++++ b/pdm/pep517/sdist.py	2022-06-29 20:39:04.267761774 +0200
+@@ -6,7 +6,8 @@
+ from copy import copy
+ from typing import Any, Iterator
+ 
+-from pdm.pep517._vendor import tomli, tomli_w
++import tomli
++import tomli_w
+ from pdm.pep517.base import Builder
+ 
+ 
+diff -ruN a/pdm/pep517/utils.py b/pdm/pep517/utils.py
+--- a/pdm/pep517/utils.py	2022-06-08 10:21:35.115564000 +0200
++++ b/pdm/pep517/utils.py	2022-06-29 20:34:45.569471470 +0200
+@@ -8,10 +8,10 @@
+ from pathlib import Path
+ from typing import Callable, Generator, Iterable, Optional, Union
+ 
+-from pdm.pep517._vendor.packaging import tags
+-from pdm.pep517._vendor.packaging.markers import Marker
+-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 Requirement
++from packaging.version import InvalidVersion, Version
+ 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-06-08 10:21:35.115564000 +0200
++++ b/pdm/pep517/validator.py	2022-06-29 20:34:19.696305368 +0200
+@@ -1,6 +1,6 @@
+ from typing import Mapping
+ 
+-from pdm.pep517._vendor import cerberus
++import cerberus
+ from pdm.pep517.exceptions import PEP621ValidationError
+ 
+ README_RULE = [
+diff -ruN a/pdm/pep517/wheel.py b/pdm/pep517/wheel.py
+--- a/pdm/pep517/wheel.py	2022-06-08 10:21:35.115564000 +0200
++++ b/pdm/pep517/wheel.py	2022-06-29 20:38:37.121277209 +0200
+@@ -15,8 +15,8 @@
+ from typing import Any, Generator, List, Mapping, Optional, TextIO, Tuple, Union
+ 
+ from pdm.pep517 import __version__
+-from pdm.pep517._vendor.packaging import tags
+-from pdm.pep517._vendor.packaging.specifiers import SpecifierSet
++from packaging import tags
++from packaging.specifiers import SpecifierSet
+ from pdm.pep517.base import Builder
+ from pdm.pep517.exceptions import BuildError
+ from pdm.pep517.utils import get_abi_tag, get_platform
+diff -ruN a/pyproject.toml b/pyproject.toml
+--- a/pyproject.toml	2022-06-08 10:21:35.115564000 +0200
++++ b/pyproject.toml	2022-06-29 20:41:54.769940447 +0200
+@@ -21,7 +21,7 @@
+     "Programming Language :: Python :: 3.9",
+     "Programming Language :: Python :: 3.10",
+ ]
+-dependencies = []
++dependencies = ["cerberus", "license-expression", "packaging", "tomli", "tomli-w"]
+ version = "0.12.7"
+ 
+ [project.license]

Deleted: python-pdm-pep517-1.0.0-devendor.patch
===================================================================
--- python-pdm-pep517-1.0.0-devendor.patch	2022-06-29 18:50:04 UTC (rev 1241091)
+++ python-pdm-pep517-1.0.0-devendor.patch	2022-06-29 18:50:15 UTC (rev 1241092)
@@ -1,129 +0,0 @@
-diff -ruN a/pdm/pep517/base.py b/pdm/pep517/base.py
---- a/pdm/pep517/base.py	2022-06-25 10:46:34.274844000 +0200
-+++ b/pdm/pep517/base.py	2022-06-27 18:17:11.911092117 +0200
-@@ -6,7 +6,7 @@
- from pathlib import Path
- from typing import Any, Dict, Iterator, List, Mapping, Optional, Tuple, TypeVar, Union
- 
--from pdm.pep517._vendor import tomli
-+import tomli
- from pdm.pep517.exceptions import MetadataError, PDMWarning, ProjectError
- 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-06-25 10:46:34.274844000 +0200
-+++ b/pdm/pep517/license.py	2022-06-27 18:12:35.273490443 +0200
-@@ -1,6 +1,6 @@
- import warnings
- 
--from pdm.pep517._vendor.license_expression import (
-+from license_expression import (
-     LicenseSymbol,
-     Licensing,
-     get_spdx_licensing,
-diff -ruN a/pdm/pep517/metadata.py b/pdm/pep517/metadata.py
---- a/pdm/pep517/metadata.py	2022-06-25 10:46:34.274844000 +0200
-+++ b/pdm/pep517/metadata.py	2022-06-27 18:13:40.700378428 +0200
-@@ -15,7 +15,7 @@
-     Union,
- )
- 
--from pdm.pep517._vendor.packaging.requirements import Requirement
-+from packaging.requirements import Requirement
- from pdm.pep517.exceptions import MetadataError, PDMWarning, ProjectError
- 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-06-25 10:46:34.274844000 +0200
-+++ b/pdm/pep517/scm.py	2022-06-27 18:12:35.276823788 +0200
-@@ -11,8 +11,8 @@
- from datetime import datetime
- from typing import Any, Dict, Iterable, List, NamedTuple, Optional, Tuple, Union
- 
--from pdm.pep517._vendor.packaging.version import LegacyVersion, Version
--from pdm.pep517._vendor.packaging.version import parse as parse_version
-+from packaging.version import LegacyVersion, Version
-+from packaging.version import parse as parse_version
- 
- 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-06-25 10:46:34.274844000 +0200
-+++ b/pdm/pep517/sdist.py	2022-06-27 18:12:35.280157133 +0200
-@@ -6,7 +6,8 @@
- from copy import copy
- from typing import Any, Iterator
- 
--from pdm.pep517._vendor import tomli, tomli_w
-+import tomli
-+import tomli_w
- from pdm.pep517.base import Builder
- 
- 
-diff -ruN a/pdm/pep517/utils.py b/pdm/pep517/utils.py
---- a/pdm/pep517/utils.py	2022-06-25 10:46:34.274844000 +0200
-+++ b/pdm/pep517/utils.py	2022-06-27 18:12:35.280157133 +0200
-@@ -9,10 +9,10 @@
- from pathlib import Path
- from typing import Callable, Generator, Iterable, Optional, Type, Union
- 
--from pdm.pep517._vendor.packaging import tags
--from pdm.pep517._vendor.packaging.markers import Marker
--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 Requirement
-+from packaging.version import InvalidVersion, Version
- 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-06-25 10:46:34.274844000 +0200
-+++ b/pdm/pep517/validator.py	2022-06-27 18:12:35.280157133 +0200
-@@ -1,6 +1,6 @@
- from typing import Mapping
- 
--from pdm.pep517._vendor import cerberus
-+import cerberus
- from pdm.pep517.exceptions import PEP621ValidationError
- 
- README_RULE = [
-diff -ruN a/pdm/pep517/wheel.py b/pdm/pep517/wheel.py
---- a/pdm/pep517/wheel.py	2022-06-25 10:46:34.274844000 +0200
-+++ b/pdm/pep517/wheel.py	2022-06-27 18:12:35.280157133 +0200
-@@ -16,8 +16,8 @@
- from typing import Any, Dict, Generator, List, Mapping, Optional, TextIO, Tuple, Union
- 
- from pdm.pep517 import __version__
--from pdm.pep517._vendor.packaging import tags
--from pdm.pep517._vendor.packaging.specifiers import SpecifierSet
-+from packaging import tags
-+from packaging.specifiers import SpecifierSet
- 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-06-25 10:46:34.274844000 +0200
-+++ b/pyproject.toml	2022-06-27 18:19:24.901541101 +0200
-@@ -21,7 +21,7 @@
-     "Programming Language :: Python :: 3.9",
-     "Programming Language :: Python :: 3.10",
- ]
--dependencies = []
-+dependencies = ["boolean.py", "cerberus", "license-expression", "packaging", "pyparsing", "tomli", "tomli-w"]
- version = "1.0.0"
- 
- [project.license]
-diff -ruN a/tests/test_metadata.py b/tests/test_metadata.py
---- a/tests/test_metadata.py	2022-06-25 10:46:34.278844000 +0200
-+++ b/tests/test_metadata.py	2022-06-27 18:15:55.670834583 +0200
-@@ -5,7 +5,7 @@
- 
- import pytest
- 
--from pdm.pep517._vendor import tomli
-+import tomli
- from pdm.pep517.metadata import Metadata
- from tests import FIXTURES
- 

Copied: python-pdm-pep517/repos/community-staging-any/python-pdm-pep517-1.0.0-devendor.patch (from rev 1241091, python-pdm-pep517/trunk/python-pdm-pep517-1.0.0-devendor.patch)
===================================================================
--- python-pdm-pep517-1.0.0-devendor.patch	                        (rev 0)
+++ python-pdm-pep517-1.0.0-devendor.patch	2022-06-29 18:50:15 UTC (rev 1241092)
@@ -0,0 +1,129 @@
+diff -ruN a/pdm/pep517/base.py b/pdm/pep517/base.py
+--- a/pdm/pep517/base.py	2022-06-25 10:46:34.274844000 +0200
++++ b/pdm/pep517/base.py	2022-06-27 18:17:11.911092117 +0200
+@@ -6,7 +6,7 @@
+ from pathlib import Path
+ from typing import Any, Dict, Iterator, List, Mapping, Optional, Tuple, TypeVar, Union
+ 
+-from pdm.pep517._vendor import tomli
++import tomli
+ from pdm.pep517.exceptions import MetadataError, PDMWarning, ProjectError
+ 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-06-25 10:46:34.274844000 +0200
++++ b/pdm/pep517/license.py	2022-06-27 18:12:35.273490443 +0200
+@@ -1,6 +1,6 @@
+ import warnings
+ 
+-from pdm.pep517._vendor.license_expression import (
++from license_expression import (
+     LicenseSymbol,
+     Licensing,
+     get_spdx_licensing,
+diff -ruN a/pdm/pep517/metadata.py b/pdm/pep517/metadata.py
+--- a/pdm/pep517/metadata.py	2022-06-25 10:46:34.274844000 +0200
++++ b/pdm/pep517/metadata.py	2022-06-27 18:13:40.700378428 +0200
+@@ -15,7 +15,7 @@
+     Union,
+ )
+ 
+-from pdm.pep517._vendor.packaging.requirements import Requirement
++from packaging.requirements import Requirement
+ from pdm.pep517.exceptions import MetadataError, PDMWarning, ProjectError
+ 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-06-25 10:46:34.274844000 +0200
++++ b/pdm/pep517/scm.py	2022-06-27 18:12:35.276823788 +0200
+@@ -11,8 +11,8 @@
+ from datetime import datetime
+ from typing import Any, Dict, Iterable, List, NamedTuple, Optional, Tuple, Union
+ 
+-from pdm.pep517._vendor.packaging.version import LegacyVersion, Version
+-from pdm.pep517._vendor.packaging.version import parse as parse_version
++from packaging.version import LegacyVersion, Version
++from packaging.version import parse as parse_version
+ 
+ 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-06-25 10:46:34.274844000 +0200
++++ b/pdm/pep517/sdist.py	2022-06-27 18:12:35.280157133 +0200
+@@ -6,7 +6,8 @@
+ from copy import copy
+ from typing import Any, Iterator
+ 
+-from pdm.pep517._vendor import tomli, tomli_w
++import tomli
++import tomli_w
+ from pdm.pep517.base import Builder
+ 
+ 
+diff -ruN a/pdm/pep517/utils.py b/pdm/pep517/utils.py
+--- a/pdm/pep517/utils.py	2022-06-25 10:46:34.274844000 +0200
++++ b/pdm/pep517/utils.py	2022-06-27 18:12:35.280157133 +0200
+@@ -9,10 +9,10 @@
+ from pathlib import Path
+ from typing import Callable, Generator, Iterable, Optional, Type, Union
+ 
+-from pdm.pep517._vendor.packaging import tags
+-from pdm.pep517._vendor.packaging.markers import Marker
+-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 Requirement
++from packaging.version import InvalidVersion, Version
+ 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-06-25 10:46:34.274844000 +0200
++++ b/pdm/pep517/validator.py	2022-06-27 18:12:35.280157133 +0200
+@@ -1,6 +1,6 @@
+ from typing import Mapping
+ 
+-from pdm.pep517._vendor import cerberus
++import cerberus
+ from pdm.pep517.exceptions import PEP621ValidationError
+ 
+ README_RULE = [
+diff -ruN a/pdm/pep517/wheel.py b/pdm/pep517/wheel.py
+--- a/pdm/pep517/wheel.py	2022-06-25 10:46:34.274844000 +0200
++++ b/pdm/pep517/wheel.py	2022-06-27 18:12:35.280157133 +0200
+@@ -16,8 +16,8 @@
+ from typing import Any, Dict, Generator, List, Mapping, Optional, TextIO, Tuple, Union
+ 
+ from pdm.pep517 import __version__
+-from pdm.pep517._vendor.packaging import tags
+-from pdm.pep517._vendor.packaging.specifiers import SpecifierSet
++from packaging import tags
++from packaging.specifiers import SpecifierSet
+ 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-06-25 10:46:34.274844000 +0200
++++ b/pyproject.toml	2022-06-27 18:19:24.901541101 +0200
+@@ -21,7 +21,7 @@
+     "Programming Language :: Python :: 3.9",
+     "Programming Language :: Python :: 3.10",
+ ]
+-dependencies = []
++dependencies = ["boolean.py", "cerberus", "license-expression", "packaging", "pyparsing", "tomli", "tomli-w"]
+ version = "1.0.0"
+ 
+ [project.license]
+diff -ruN a/tests/test_metadata.py b/tests/test_metadata.py
+--- a/tests/test_metadata.py	2022-06-25 10:46:34.278844000 +0200
++++ b/tests/test_metadata.py	2022-06-27 18:15:55.670834583 +0200
+@@ -5,7 +5,7 @@
+ 
+ import pytest
+ 
+-from pdm.pep517._vendor import tomli
++import tomli
+ from pdm.pep517.metadata import Metadata
+ from tests import FIXTURES
+ 



More information about the arch-commits mailing list