Sync from SUSE:SLFO:Main python-setuptools revision aae8d7c46c0f2d7f5d3c5fee9a9ac02c

python-setuptools.changes

@@ -1,3 +1,53 @@
+-------------------------------------------------------------------
+Fri Sep 13 04:01:00 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Remove BuildRequires on wheel, it has been adopted since 71.1.
+- Sort out test suite changes.
+
+-------------------------------------------------------------------
+Tue Jul 30 02:22:34 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Update to 72.1.0:
+  * Restore the tests command and deprecate access to the module.
+  * Added return types to typed public functions.
+  * Removed lingering unused code around Distribution._patched_dist.
+  * Reset the backports module when enabling vendored packages.
+  * Include all vendored files in the sdist.
+  * Restored package data that went missing in 71.0. This change also
+    incidentally causes tests to be installed once again.
+  * Now setuptools declares its own dependencies in the core extra.
+    Dependencies are still vendored for bootstrapping purposes, but
+    setuptools will prefer installed dependencies if present. The core
+    extra is used for informational purposes and should *not* be declared
+    in package metadata (e.g. build-requires).
+  * Support for loading distutils from the standard library is now
+    deprecated, including use of SETUPTOOLS_USE_DISTUTILS=stdlib and
+    importing distutils before importing setuptools.
+  * Fix distribution name normalisation for valid versions that are not
+    canonical (e.g. 1.0-2).
+
+-------------------------------------------------------------------
+Sat Jun 29 05:45:24 UTC 2024 - Dirk Müller <dmueller@suse.com>
+
+- update to 70.1.1:
+  * Improve error message when pkg_resources.ZipProvider tries to
+    extract resources with a missing Egg
+    Added variables and parameter type annotations to
+    pkg_resources to be nearly on par with typeshed.*
+  * Improve error message when pkg_resources.ZipProvider tries to
+    extract resources with a missing Egg
+  * Added variables and parameter type annotations to
+    pkg_resources to be nearly on par with typeshed.*
+  * Migrated Setuptools' own config to pyproject.toml
+  * Prevent a TypeError: 'NoneType' object is not callable when
+    shutil_rmtree is called without an onexc parameter on
+    Python<=3.11
+  * Replace use of mktemp with can_symlink from the stdlib test
+    suite.
+  * Improvement for attr: directives in configuration to handle
+    more edge cases related to complex package_dir.
+  * Fix accidental implicit string concatenation.
+
 -------------------------------------------------------------------
 Tue May 28 05:20:31 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>
 

python-setuptools.spec

@@ -16,7 +16,6 @@
 #
 
 
-%define skip_python2 1
 %global flavor @BUILD_FLAVOR@%{nil}
 %if "%{flavor}" == "test"
 %define psuffix -test
@@ -31,7 +30,7 @@
 %define mypython python
 %{?sle15_python_module_pythons}
 Name:           python-setuptools%{psuffix}
-Version:        70.0.0
+Version:        72.1.0
 Release:        0
 Summary:        Download, build, install, upgrade, and uninstall Python packages
 License:        Apache-2.0 AND MIT AND BSD-2-Clause AND Python-2.0
@@ -40,8 +39,6 @@ Source:         https://files.pythonhosted.org/packages/source/s/setuptools/setu
 Patch0:         sort-for-reproducibility.patch
 # Bootstrap: Don't BuildRequire pip here!
 BuildRequires:  %{python_module base >= 3.9}
-# The rpm python-wheel build is bootstrap friendly since 0.42
-BuildRequires:  %{python_module wheel >= 0.42}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 Requires(post): update-alternatives
@@ -54,8 +51,9 @@ BuildRequires:  %{python_module filelock >= 3.4.0}
 BuildRequires:  %{python_module ini2toml-lite >= 0.9}
 BuildRequires:  %{python_module jaraco.develop >= 7.21}
 BuildRequires:  %{python_module jaraco.envs >= 2.2}
+BuildRequires:  %{python_module jaraco.packaging >= 10.0}
 BuildRequires:  %{python_module jaraco.path >= 3.2.0}
-BuildRequires:  %{python_module packaging}
+BuildRequires:  %{python_module jaraco.test}
 BuildRequires:  %{python_module pip >= 19.1}
 BuildRequires:  %{python_module pip-run >= 8.8}
 BuildRequires:  %{python_module pytest >= 6}
@@ -120,16 +118,18 @@ cp %{$python_sitelib}/../wheels/setuptools-%{version}-py3-none-any.whl $PWD/dist
 }
 export PRE_BUILT_SETUPTOOLS_WHEEL=$PWD/dist/setuptools-%{version}-py3-none-any.whl
 export LANG=en_US.UTF-8
+export PIP_FIND_LINKS=$PWD/dist
 # tests need imports from local source dir
 export PYTHONPATH=$(pwd)
 # no online comparisons in obs
 donttest="(test_apply_pyproject_equivalent_to_setupcfg and https)"
 # test_pbr_integration tries to install pbr from network using pip
 donttest+=" or test_pbr_integration"
-# test_example_file_in_sdist wants wheel.whl
-donttest+=" or test_example_file_in_sdist"
-# Failing doctest: AttributeError: 'Path' object has no attribute 'iterdir'
-donttest+=" or yield_top_level"
+# looks for .exe files that we do not ship
+donttest+=" or test_wheel_includes_cli_scripts"
+# ignores environment variables
+donttest+=" or test_setup_requires_with_distutils_command_dep"
+donttest+=" or test_setup_requires_with_transitive_extra_dependency"
 %pytest -rfE -n auto -k "not ($donttest)"
 %endif