diff --git a/fix-get-python-lib-python38.patch b/fix-get-python-lib-python38.patch index a08c038..ed8888f 100644 --- a/fix-get-python-lib-python38.patch +++ b/fix-get-python-lib-python38.patch @@ -1,8 +1,8 @@ -Index: setuptools-65.5.1/setuptools/_distutils/sysconfig.py +Index: setuptools-68.0.0/setuptools/_distutils/sysconfig.py =================================================================== ---- setuptools-65.5.1.orig/setuptools/_distutils/sysconfig.py -+++ setuptools-65.5.1/setuptools/_distutils/sysconfig.py -@@ -238,9 +238,13 @@ def get_python_lib(plat_specific=0, stan +--- setuptools-68.0.0.orig/setuptools/_distutils/sysconfig.py ++++ setuptools-68.0.0/setuptools/_distutils/sysconfig.py +@@ -246,9 +246,13 @@ def get_python_lib(plat_specific=0, stan if os.name == "posix": if plat_specific or standard_lib: diff --git a/python-setuptools.changes b/python-setuptools.changes index 5e06861..05ccf7e 100644 --- a/python-setuptools.changes +++ b/python-setuptools.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Sun Aug 13 18:25:04 UTC 2023 - Dirk Müller + +- update to 68.0.0: + * Removed verification for existing ``depends.txt`` file + * Remove autofixing of broken ``.egg-info`` directories + containing the ``-`` character in their base name (without suffix). + * Remove deprecated APIs in ``easy_install``: + ``get_script_args``, + ``get_script_header`` and ``get_writer``. + * Removed ``egg_info.get_pkg_info_revision`` (deprecated + * Removed ``setuptools.dist._get_unpatched`` (deprecated + * Removed support for SVN in + ``setuptools.package_index`` (deprecated since 2018). + * Removed support for invalid ``pyproject.toml`` files. + * Added symlink support to launcher for installed + executables -- by :user:`eugene-sevostianov-sc` + * Updated vendored ``packaging`` version from 23.0 to + 23.1 -- by :user:`MetRonnie` + * Implemented workaround for old versions of + ``vswhere``, which miss the + * ``-requiresAny`` parameter, such as the ones distributed + together with Visual Studio 2017 < 15.6. + * Changed ``DistutilsMetaFinder`` to skip + ``spec_for_pip`` on Python >= 3.12. + * Removed ``_distutils_hack.remove_shim`` on Python >= + 3.12 (since ``distutils`` was removed from the standard library, + ``DistutilsMetaFinder`` cannot be disabled on Python >= + 3.12). + * #3920: Add a link to deprecation warning in ``pkg_resources`` + and improve ``stacklevel`` for better visibility. +- drop use-tarfile-extraction_filter.patch (upstream) + ------------------------------------------------------------------- Wed Jun 7 09:07:45 UTC 2023 - Daniel Garcia diff --git a/python-setuptools.spec b/python-setuptools.spec index 1ab3ad7..4033237 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -38,7 +38,7 @@ %define mypython python %{?sle15_python_module_pythons} Name: python-setuptools%{psuffix} -Version: 67.8.0 +Version: 68.0.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 @@ -47,8 +47,6 @@ Source: https://files.pythonhosted.org/packages/source/s/setuptools/setu Patch0: sort-for-reproducibility.patch # PATCH-FIX-OPENSUSE fix-get-python-lib-python38.patch bsc#1204395 Patch2: fix-get-python-lib-python38.patch -# PATCH-FIX-UPSTREAM gh#pypa/setuptools#3917 -Patch3: use-tarfile-extraction_filter.patch BuildRequires: %{python_module base >= 3.7} BuildRequires: fdupes BuildRequires: python-rpm-macros diff --git a/setuptools-67.8.0.tar.gz b/setuptools-67.8.0.tar.gz deleted file mode 100644 index 4650f0d..0000000 --- a/setuptools-67.8.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:62642358adc77ffa87233bc4d2354c4b2682d214048f500964dbe760ccedf102 -size 2492475 diff --git a/setuptools-68.0.0.tar.gz b/setuptools-68.0.0.tar.gz new file mode 100644 index 0000000..f8cf2e1 --- /dev/null +++ b/setuptools-68.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:baf1fdb41c6da4cd2eae722e135500da913332ab3f2f5c7d33af9b492acb5235 +size 2194111 diff --git a/use-tarfile-extraction_filter.patch b/use-tarfile-extraction_filter.patch deleted file mode 100644 index 223795d..0000000 --- a/use-tarfile-extraction_filter.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 788a7601c88db28435a70e5bb17e6eba23a31e4c Mon Sep 17 00:00:00 2001 -From: Steve Kowalik -Date: Wed, 3 May 2023 12:02:19 +1000 -Subject: [PATCH] tests: Add extraction_filter for tarfile - -Python 3.12, and earlier via security backports now issue an -DeprecationWarning when calling tarfile.extractall without an extraction -filter set. Since the only place we've called extractall is literally -right after we've created the archive, use a fully trusted filter. This -can be replaced with a filter argument to extractall in future. ---- - setuptools/tests/test_easy_install.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py -index bca86066ad..edc9af8252 100644 ---- a/setuptools/tests/test_easy_install.py -+++ b/setuptools/tests/test_easy_install.py -@@ -615,6 +615,7 @@ def test_setup_requires_override_nspkg(self, use_setup_cfg): - foobar_1_dir = os.path.join(temp_dir, 'foo.bar-0.1') - os.mkdir(foobar_1_dir) - with tarfile.open(foobar_1_archive) as tf: -+ tf.extraction_filter = (lambda member, path: member) - tf.extractall(foobar_1_dir) - sys.path.insert(1, foobar_1_dir) -