Update to 67.6.1

3787.patch

@@ -1,32 +0,0 @@
-From c3441cb149f27d283d51ec4f6cecd6a5052de87a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 21 Jan 2023 10:22:16 +0100
-Subject: [PATCH] Fix dependency syntax error in test_dist_info
-
-Fix the install_requires used in test_dist_info to use the dangling
-syntax, in order to correctly handle markers.  This fixes syntax error
-when parsed by packaging-22.0+, as well as setuptools warning:
-
-```
-UserWarning: One of the parsed requirements in `install_requires` looks like a valid environment marker: \'sys_platform != "linux"\'
-Make sure that the config is correct and check https://setuptools.pypa.io/en/latest/userguide/declarative_config.html#opt-2
-  warnings.warn(msg, UserWarning)\n'
-```
----
- setuptools/tests/test_dist_info.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py
-index 45b0d7fbb4..2ed790762f 100644
---- a/setuptools/tests/test_dist_info.py
-+++ b/setuptools/tests/test_dist_info.py
-@@ -142,7 +142,8 @@ class TestWheelCompatibility:
-     version = {version}
- 
-     [options]
--    install_requires = foo>=12; sys_platform != "linux"
-+    install_requires =
-+        foo>=12; sys_platform != "linux"
- 
-     [options.extras_require]
-     test = pytest

Remove-optional-or-unpackaged-test-deps.patch

@@ -1,22 +1,23 @@
-From 87a18ba242ac7f02d41b877ffc796dde42e6a93e Mon Sep 17 00:00:00 2001
+From a03fa24ad65286ad9f2dc8bf1934bc84525ed06f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= <thrnciar@redhat.com>
+From: Charalampos Stratakis <cstratak@redhat.com>
-Date: Wed, 10 Aug 2022 16:08:41 +0200
+Date: Wed, 8 Mar 2023 02:48:31 +0100
 Subject: [PATCH] Remove optional or unpackaged test deps
 
 ---
- setup.cfg | 14 --------------
+ setup.cfg | 16 ----------------
- 1 file changed, 14 deletions(-)
+ 1 file changed, 16 deletions(-)
 
 diff --git a/setup.cfg b/setup.cfg
-index b4ee876..094f621 100644
+index 4791ed6..2776b31 100644
 --- a/setup.cfg
 +++ b/setup.cfg
-@@ -39,19 +39,7 @@ exclude =
+@@ -39,20 +39,6 @@ exclude =
  [options.extras_require]
  testing = 
  	pytest >= 6
 -	pytest-checkdocs >= 2.4
--	pytest-flake8
+-	pytest-flake8; \
+-	python_version < "3.12"
 -	flake8 < 5
 -	pytest-black >= 0.3.7; \
 -	python_implementation != "PyPy"
@@ -26,12 +27,12 @@ index b4ee876..094f621 100644
 -	python_implementation != "PyPy"
 -	pytest-enabler >= 1.3
 -	pytest-perf
- 	
+-	
 -	flake8-2020
  	virtualenv>=13.0.0
  	wheel
  	pip>=19.1 # For proper file:// URLs support.
-@@ -59,8 +47,6 @@ testing =
+@@ -60,8 +46,6 @@ testing =
  	pytest-xdist
  	jaraco.path>=3.2.0
  	build[virtualenv]
@@ -41,5 +42,5 @@ index b4ee876..094f621 100644
  	tomli-w>=1.0.0
  	pytest-timeout
 -- 
-2.37.3
+2.39.2
 

python-setuptools.spec

@@ -18,15 +18,14 @@
 
 Name:           python-setuptools
 # When updating, update the bundled libraries versions bellow!
-Version:        65.5.1
+Version:        67.6.1
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        Easily build and distribute Python packages
 # setuptools is MIT
-# appdirs is MIT
+# platformdirs is MIT
 # more-itertools is MIT
 # ordered-set is MIT
 # packaging is BSD-2-Clause OR Apache-2.0
-# pyparsing is MIT
 # importlib-metadata is Apache-2.0
 # importlib-resources is Apache-2.0
 # jaraco.text is MIT
@@ -42,10 +41,6 @@ Source0:        %{pypi_source %{srcname} %{version}}
 # Some test deps are optional and either not desired or not available in Fedora, thus this patch removes them.
 Patch:          Remove-optional-or-unpackaged-test-deps.patch
 
-# Tests compatibility with wheel 0.40+
-# Merged upstream
-Patch:          https://github.com/pypa/setuptools/pull/3787.patch
-
 BuildArch:      noarch
 
 BuildRequires:  python%{python3_pkgversion}-devel
@@ -77,14 +72,14 @@ execute the software that requires pkg_resources.
 # Bundled packages are defined in multiple files. Generate the list with:
 # %%{_rpmconfigdir}/pythonbundles.py --namespace 'python%%{python3_pkgversion}dist' */_vendor/vendored.txt
 %global bundled %{expand:
-Provides: bundled(python%{python3_pkgversion}dist(appdirs)) = 1.4.3
+Provides: bundled(python%{python3_pkgversion}dist(platformdirs)) = 2.6.2
-Provides: bundled(python%{python3_pkgversion}dist(importlib-metadata)) = 4.11.1
+Provides: bundled(python%{python3_pkgversion}dist(importlib-metadata)) = 6
-Provides: bundled(python%{python3_pkgversion}dist(importlib-resources)) = 5.4
+Provides: bundled(python%{python3_pkgversion}dist(importlib-resources)) = 5.10.2
 Provides: bundled(python%{python3_pkgversion}dist(jaraco-text)) = 3.7
 Provides: bundled(python%{python3_pkgversion}dist(more-itertools)) = 8.8
 Provides: bundled(python%{python3_pkgversion}dist(ordered-set)) = 3.1.1
-Provides: bundled(python%{python3_pkgversion}dist(packaging)) = 21.3
+Provides: bundled(python%{python3_pkgversion}dist(packaging)) = 23
-Provides: bundled(python%{python3_pkgversion}dist(pyparsing)) = 3.0.9
+Provides: bundled(python%{python3_pkgversion}dist(typing-extensions)) = 4.4
 Provides: bundled(python%{python3_pkgversion}dist(typing-extensions)) = 4.0.1
 Provides: bundled(python%{python3_pkgversion}dist(zipp)) = 3.7
 Provides: bundled(python%{python3_pkgversion}dist(tomli)) = 2.0.1
@@ -231,6 +226,10 @@ PYTHONPATH=$(pwd) %pytest \
 
 
 %changelog
+* Thu Apr 20 2023 Charalampos Stratakis <cstratak@redhat.com> - 67.6.1-1
+- Update to 67.6.1
+- Fixes: rhbz#2144132
+
 * Tue Mar 28 2023 Miro Hrončok <mhroncok@redhat.com> - 65.5.1-3
 - Fix tests with wheel 0.40
 

sources

@@ -1 +1 @@
-SHA512 (setuptools-65.5.1.tar.gz) = e75eb7fdb0bc5ffdc76ed864cf753c2672d097a60f8747ac5cd40a49276d33df31fb619877234b4c22693b627d9978ecdd48a5c6c48aa0bbb856d48dec70fb0a
+SHA512 (setuptools-67.6.1.tar.gz) = 197910ad4c4058af0107e240d2e27bc2c1ff373cb3fba33af09eb3cc42614c45e4bb73a65802f253466eafd94517e08b51e98f50213817ad03d88ee0ccf9adbc