upg python-{setuptools,packaging}

mv python-zipp to jobcomm

python-packaging/PKGBUILD

@@ -6,33 +6,35 @@
 #-----------------------------------------| DESCRIPTION |---------------------------------------
 
 pkgname=python-packaging
-pkgver=21.3
+pkgver=23.0
 pkgrel=01
 pkgdesc="Core utilities for Python packages"
 arch=('any')
 url="https://github.com/pypa/packaging"
-depends=('python-pyparsing')
-makedepends=('python-setuptools')
+depends=('python')
+makedepends=('python-build' 'python-installer' 'python-flit-core')
 checkdepends=('python-pytest' 'python-pretend')
 source=("https://github.com/pypa/packaging/archive/$pkgver/$pkgname-$pkgver.tar.gz")
 
 build() {
   cd packaging-$pkgver
-  python setup.py build
+  python -m build -nw
 }
 
 check() {
   cd packaging-$pkgver
-  python -m pytest
+  PYTHONPATH=src pytest
 }
 
 package() {
   cd packaging-$pkgver
-  python setup.py install --root="$pkgdir" --optimize=1
+  python -m installer --destdir="$pkgdir" dist/*.whl
 }
 
 #---- license gpg-key sha256sums ----
 
 license=('Apache')
 
-sha256sums=(618b3f2c055a0c0b5e072026fabce690fc753d5337d4493f8393f19e038e6308) # python-packaging-21.3.tar.gz
+sha256sums=(698f2c072c89a5eb7d9560b64401d52b2d5eaca412bc53f9bddfef214dca71aa) # python-packaging-23.0.tar.gz
+
+

python-packaging/PKGBUILD-arch

@@ -1,29 +1,29 @@
 # Maintainer: Felix Yan <felixonmars@archlinux.org>
 
 pkgname=python-packaging
-pkgver=21.3
+pkgver=23.0
 pkgrel=1
 pkgdesc="Core utilities for Python packages"
 arch=('any')
 url="https://github.com/pypa/packaging"
 license=('Apache')
-depends=('python-pyparsing')
-makedepends=('python-setuptools')
+depends=('python')
+makedepends=('python-build' 'python-installer' 'python-flit-core')
 checkdepends=('python-pytest' 'python-pretend')
 source=("https://github.com/pypa/packaging/archive/$pkgver/$pkgname-$pkgver.tar.gz")
-sha512sums=('8960deacda26877b73d98a3b632e760e902a16ec7a04707f84044980e4d4fb33e4f584db115c9008066aa876079f28633bafe37fbd5ce9a23830b6b89eb4ae7a')
+sha512sums=('5dd2f4a596e5a1ed01b461a37e063573f5ae08e181df40377a167fe2483205b3d965e10dc403cd173d0f87e0bdcae3cde05bd39024783fbe44541d0f777d94de')
 
 build() {
   cd packaging-$pkgver
-  python setup.py build
+  python -m build -nw
 }
 
 check() {
   cd packaging-$pkgver
-  python -m pytest
+  PYTHONPATH=src pytest
 }
 
 package() {
   cd packaging-$pkgver
-  python setup.py install --root="$pkgdir" --optimize=1
+  python -m installer --destdir="$pkgdir" dist/*.whl
 }

python-packaging/deps

@@ -1,4 +1,6 @@
-python-pyparsing
-python-setuptools
-python-pytest
+python-installer
+python-flit-core
 python-pretend
+python-build
+python-pytest
+

python-packaging/time

@@ -1,5 +1,6 @@
 
-real	0m35.588s
-user	0m34.152s
-sys	0m1.513s
 
+real	0m31.400s
+user	0m29.492s
+sys	0m1.496s
+ 

python-setuptools/PKGBUILD

@@ -6,14 +6,17 @@
 #-----------------------------------------| DESCRIPTION |---------------------------------------
 
 pkgname=python-setuptools
-pkgver=65.6.3
+pkgver=67.0.0
 pkgrel=01
 epoch=1
 pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages"
 arch=('any')
 url="https://pypi.org/project/setuptools/"
-depends=('python-appdirs' 'python-jaraco.text' 'python-more-itertools' 'python-ordered-set'
-         'python-packaging' 'python-pyparsing' 'python-tomli' 'python-validate-pyproject')
+#depends=('python-appdirs' 'python-jaraco.text' 'python-more-itertools' 'python-ordered-set'
+#         'python-packaging' 'python-pyparsing' 'python-tomli' 'python-validate-pyproject')
+depends=('python-jaraco.text' 'python-more-itertools' 'python-ordered-set' 'python-packaging'
+         'python-platformdirs' 'python-tomli' 'python-validate-pyproject')
+
 makedepends=('git' 'python-setuptools')
 checkdepends=('python-jaraco.envs' 'python-jaraco.path' 'python-pip' 'python-pip-run'
               'python-pytest-fixture-config' 'python-pytest-virtualenv' 'python-wheel'
@@ -72,6 +75,10 @@ build() {
   python setup.py build
 }
 
+# a few tests may fail when building outside a container, comment this check section out,
+# and rerun without using the -f option on makepkg ... Hopefully the tests failures will
+# vanish in the expected multiple Arch releases of this pkg.
+
 check() { (
   # Workaround UTF-8 tests by setting LC_CTYPE
   export LC_CTYPE=en_US.UTF-8
@@ -84,9 +91,11 @@ check() { (
   # rest: skipping broken tests using "setuptools_sdist", "setuptools_wheel" (or "venv" which uses the latter)
   #       and fails with pip
   # 2: pip failures related to devendoring, 
+  # 3: TODO
   PYTHONPATH="$PWD"/build/lib python -m pytest \
     --deselect setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg \
-    --deselect setuptools/tests/test_virtualenv.py
+    --deselect setuptools/tests/test_virtualenv.py \
+    --deselect setuptools/tests/test_editable_install.py::test_editable_with_prefix
 )}
 
 package() {
@@ -98,8 +107,8 @@ package() {
 
 license=('PSF')
 
-sha256sums=(d8402d8d0c0fc5a2d93285fc267658ab49cfc6d3fbd7a7539eb3119eb52ffb0e  # python-setuptools-65.6.3.tar.gz
+sha256sums=(5efe325d3a2b7312165ada3490083429a0ea20087d38fab4460a892a71ec0864  # python-setuptools-67.0.0.tar.gz
 	06e2f68aebedbaeb0b0fe923eae686568910cc3355b33bf619db9266eef83efb  # system-validate-pyproject.patch
-	e4634a028f3741aa06ca8a5e61bb4bbc293146e943bbd8d5605c49a4d886203a) # add-dependency.patch
+	a2bc8b9d470c13b4cb682ab3943e80ab2841aae98f7c3d9ba1f089408f96aa91) #  add-dependency.patch
 
 

python-setuptools/PKGBUILD-arch

@@ -3,15 +3,15 @@
 # Contributor: Eli Schwartz <eschwartz@archlinux.org>
 
 pkgname=python-setuptools
-pkgver=65.6.3
+pkgver=67.0.0
 pkgrel=1
 epoch=1
 pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages"
 arch=('any')
 license=('PSF')
 url="https://pypi.org/project/setuptools/"
-depends=('python-appdirs' 'python-jaraco.text' 'python-more-itertools' 'python-ordered-set'
-         'python-packaging' 'python-pyparsing' 'python-tomli' 'python-validate-pyproject')
+depends=('python-jaraco.text' 'python-more-itertools' 'python-ordered-set' 'python-packaging'
+         'python-platformdirs' 'python-tomli' 'python-validate-pyproject')
 makedepends=('git' 'python-setuptools')
 checkdepends=('python-jaraco.envs' 'python-jaraco.path' 'python-pip' 'python-pip-run'
               'python-pytest-fixture-config' 'python-pytest-virtualenv' 'python-wheel'
@@ -22,9 +22,9 @@ replaces=('python-distribute')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/pypa/setuptools/archive/v$pkgver.tar.gz"
         system-validate-pyproject.patch
         add-dependency.patch)
-sha512sums=('cf6a020636060391c3e4ac5896bd3580b8a6c7671237faa48372b6a64d0785cbd12910bd3c9b458b2008ccafd1e122a249513d45c8c9bcd2637b6628d68a3210'
+sha512sums=('17ffb92f3a1008b13943f69d2dc934a9f7e91f0f4298244bb049893830373fe7519a573ac82eebdba4051588aaefe7db5e6d0aa32cdc22e4fb2c9a842bc73aff'
             '390fea2c575a0042054f51d33e629b04a48f832f0a4a2dd07d34e23cdf330c382dba0f54bfb7c8a6a253bb248a4940f2a789672f715e4dc2aeb395fa185cae7a'
-            '4277c983f17db19b0e499ceff7b6e24aad4f7956ec282bb7f5148f6f44e4e35077bfdfa219cbc04f49f37d0b9dc9c3e3075db7a36dbdc30944e1bd28efad0e0b')
+            '9c5d80c753e78bf613572fb789a234984087d0ce96d0bad22b5ed731d83c77bf6d8acfa65c78f6c78f9063be7819c2b58988fdf8e7fc89b55339f94a87b3b21f')
 
 export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
 
@@ -83,9 +83,11 @@ check() { (
   cd setuptools-$pkgver
   # 1: subtle difference introduced by devendoring
   # 2: pip failures related to devendoring, 
+  # 3: TODO
   PYTHONPATH="$PWD"/build/lib python -m pytest \
     --deselect setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg \
-    --deselect setuptools/tests/test_virtualenv.py
+    --deselect setuptools/tests/test_virtualenv.py \
+    --deselect setuptools/tests/test_editable_install.py::test_editable_with_prefix
 )}
 
 package() {

python-setuptools/add-dependency.patch

@@ -2,16 +2,15 @@ diff --git a/setup.cfg.org b/setup.cfg
 index f9dd790..0cd700e 100644
 --- a/setup.cfg.orig
 +++ b/setup.cfg
-@@ -26,6 +26,14 @@ packages = find_namespace:
+@@ -26,6 +26,13 @@ packages = find_namespace:
  # include_package_data = true
  python_requires = >=3.7
  install_requires =
-+	appdirs
++	platformdirs
 +	jaraco.text
 +	more-itertools
 +	ordered-set
 +	packaging
-+	pyparsing
 +	tomli
 +	validate-pyproject
  

python-setuptools/add-dependency.patch.diffs

@@ -0,0 +1,20 @@
+--- add-dependency.patch	2023-01-29 18:53:13.468062269 +0200
++++ add-dependency.patch.old	2022-11-12 16:30:46.942253520 +0200
+@@ -2,15 +2,16 @@
+ index f9dd790..0cd700e 100644
+ --- a/setup.cfg.orig
+ +++ b/setup.cfg
+-@@ -26,6 +26,13 @@ packages = find_namespace:
++@@ -26,6 +26,14 @@ packages = find_namespace:
+  # include_package_data = true
+  python_requires = >=3.7
+  install_requires =
+-+	platformdirs
+++	appdirs
+ +	jaraco.text
+ +	more-itertools
+ +	ordered-set
+ +	packaging
+++	pyparsing
+ +	tomli
+ +	validate-pyproject

python-setuptools/deps

@@ -1,12 +1,11 @@
-python-appdirs
+git
 python-jaraco.text
 python-more-itertools
 python-ordered-set
 python-packaging
-python-pyparsing
+python-platformdirs
 python-tomli
 python-validate-pyproject
-git
 python-setuptools
 python-jaraco.envs
 python-jaraco.path
@@ -23,4 +22,3 @@ python-build
 python-ini2toml
 python-tomli-w
 
-