From 54b60876e319484e6b56e92347334b6860a3fa4efe5c13d9b733b945e7c5984c Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Tue, 28 May 2024 05:21:21 +0000 Subject: [PATCH] - Update to 70.0.0: * Features + Emit a warning when [tools.setuptools] is present in pyproject.toml and will be ignored. + Improved AttributeError error message if pkg_resources.EntryPoint.require is called without extras or distribution Gracefully "do nothing" when trying to activate a pkg_resources.Distribution with a None location, rather than raising a TypeError. + Refresh unpinned vendored dependencies. + Updated vendored packaging to version 24.0. + Merged with pypa/distutils@55982565e. + Support PEP 625 by canonicalizing package name and version in filenames. + Explicitly use encoding="locale" for .pth files whenever possible, to reduce EncodingWarnings. + Updated and removed obsolete Python < 3.8 code and comments. + Updated pkg_resources to use stdlib importlib.machinery instead of importlib_machinery. * Bugfixes + In install command, use super to call the superclass methods. Avoids race conditions when monkeypatching from _distutils_system_mod occurs late. + Fix finder template for lenient editable installs of implicit nested namespaces constructed by using package_dir to reorganise directory structure. + Remove attempt to canonicalize the version. It's already canonical enough. + Clarify some pkg_resources methods return bytes, not str. Also return an empty bytes in EmptyProvider._get. + Return an empty list by default in pkg_resources.ResourceManager.cleanup_resources. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=262 --- python-setuptools.changes | 43 ++++++++++++++++++++++++++++++++++ python-setuptools.spec | 10 +++++--- setuptools-69.0.3.tar.gz | 3 --- setuptools-70.0.0.tar.gz | 3 +++ sort-for-reproducibility.patch | 28 +++++++++++----------- 5 files changed, 67 insertions(+), 20 deletions(-) delete mode 100644 setuptools-69.0.3.tar.gz create mode 100644 setuptools-70.0.0.tar.gz diff --git a/python-setuptools.changes b/python-setuptools.changes index e752368..1b1988a 100644 --- a/python-setuptools.changes +++ b/python-setuptools.changes @@ -1,3 +1,46 @@ +------------------------------------------------------------------- +Tue May 28 05:20:31 UTC 2024 - Steve Kowalik + +- Update to 70.0.0: + * Features + + Emit a warning when [tools.setuptools] is present in pyproject.toml and + will be ignored. + + Improved AttributeError error message if pkg_resources.EntryPoint.require + is called without extras or distribution Gracefully "do nothing" when + trying to activate a pkg_resources.Distribution with a None location, + rather than raising a TypeError. + + Refresh unpinned vendored dependencies. + + Updated vendored packaging to version 24.0. + + Merged with pypa/distutils@55982565e. + + Support PEP 625 by canonicalizing package name and version in filenames. + + Explicitly use encoding="locale" for .pth files whenever possible, to + reduce EncodingWarnings. + + Updated and removed obsolete Python < 3.8 code and comments. + + Updated pkg_resources to use stdlib importlib.machinery instead of + importlib_machinery. + * Bugfixes + + In install command, use super to call the superclass methods. Avoids + race conditions when monkeypatching from _distutils_system_mod occurs + late. + + Fix finder template for lenient editable installs of implicit nested + namespaces constructed by using package_dir to reorganise directory + structure. + + Remove attempt to canonicalize the version. It's already canonical + enough. + + Clarify some pkg_resources methods return bytes, not str. Also return an + empty bytes in EmptyProvider._get. + + Return an empty list by default in + pkg_resources.ResourceManager.cleanup_resources. + + Made pkg_resoursces.NullProvider's has_metadata and metadata_isdir + methods return actual booleans like all other Providers. + + In tests, rely on pytest-home for reusable fixture. + + Explicitely marked as Protocol and fixed missing self argument in + interfaces pkg_resources.IMetadataProvider and + pkg_resources.IResourceProvider. + + Restored expectation that egg-link files would be named with dash + separators for compatibility with pip prior to version 24. +- Refresh patch sort-for-reproducibility.patch + ------------------------------------------------------------------- Tue Jan 2 21:55:38 UTC 2024 - Dirk Müller diff --git a/python-setuptools.spec b/python-setuptools.spec index c167515..b3a750a 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -1,5 +1,5 @@ # -# spec file +# spec file for package python-setuptools # # Copyright (c) 2024 SUSE LLC # @@ -31,7 +31,7 @@ %define mypython python %{?sle15_python_module_pythons} Name: python-setuptools%{psuffix} -Version: 69.0.3 +Version: 70.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 @@ -45,7 +45,7 @@ BuildRequires: %{python_module wheel >= 0.42} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires(post): update-alternatives -Requires(postun):update-alternatives +Requires(postun): update-alternatives BuildArch: noarch %if %{with test} BuildRequires: %{python_module build} @@ -58,6 +58,8 @@ BuildRequires: %{python_module jaraco.path >= 3.2.0} BuildRequires: %{python_module pip >= 19.1} BuildRequires: %{python_module pip-run >= 8.8} BuildRequires: %{python_module pytest >= 6} +BuildRequires: %{python_module pytest-home} +BuildRequires: %{python_module pytest-subprocess} BuildRequires: %{python_module pytest-timeout} BuildRequires: %{python_module pytest-xdist} BuildRequires: %{python_module setuptools = %{version}} @@ -123,6 +125,8 @@ export PYTHONPATH=$(pwd) 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" %pytest -rfE -n auto -k "not ($donttest)" %endif diff --git a/setuptools-69.0.3.tar.gz b/setuptools-69.0.3.tar.gz deleted file mode 100644 index 1abde1b..0000000 --- a/setuptools-69.0.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:be1af57fc409f93647f2e8e4573a142ed38724b8cdd389706a867bb4efcf1e78 -size 2219609 diff --git a/setuptools-70.0.0.tar.gz b/setuptools-70.0.0.tar.gz new file mode 100644 index 0000000..ffb428c --- /dev/null +++ b/setuptools-70.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f211a66637b8fa059bb28183da127d4e86396c991a942b028c6650d4319c3fd0 +size 2265182 diff --git a/sort-for-reproducibility.patch b/sort-for-reproducibility.patch index 56ca4e9..6e74a88 100644 --- a/sort-for-reproducibility.patch +++ b/sort-for-reproducibility.patch @@ -6,11 +6,11 @@ setuptools/tests/test_wheel.py | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) -Index: setuptools-69.0.2/setuptools/command/easy_install.py +Index: setuptools-70.0.0/setuptools/command/easy_install.py =================================================================== ---- setuptools-69.0.2.orig/setuptools/command/easy_install.py -+++ setuptools-69.0.2/setuptools/command/easy_install.py -@@ -441,7 +441,7 @@ class easy_install(Command): +--- setuptools-70.0.0.orig/setuptools/command/easy_install.py ++++ setuptools-70.0.0/setuptools/command/easy_install.py +@@ -436,7 +436,7 @@ class easy_install(Command): for spec in self.args: self.easy_install(spec, not self.no_deps) if self.record: @@ -19,31 +19,31 @@ Index: setuptools-69.0.2/setuptools/command/easy_install.py if self.root: # strip any package prefix root_len = len(self.root) for counter in range(len(outputs)): -Index: setuptools-69.0.2/setuptools/tests/test_wheel.py +Index: setuptools-70.0.0/setuptools/tests/test_wheel.py =================================================================== ---- setuptools-69.0.2.orig/setuptools/tests/test_wheel.py -+++ setuptools-69.0.2/setuptools/tests/test_wheel.py -@@ -424,30 +424,30 @@ WHEEL_INSTALL_TESTS = ( +--- setuptools-70.0.0.orig/setuptools/tests/test_wheel.py ++++ setuptools-70.0.0/setuptools/tests/test_wheel.py +@@ -411,30 +411,30 @@ WHEEL_INSTALL_TESTS = ( dict( id='requires_ensure_order', - install_requires=''' + install_requires=""" - foo bar baz + foo qux - ''', + """, extras_require={ - 'extra': ''' + 'extra': """ - foobar>3 barbaz>4 bazqux>5 + foobar>3 quxzap>6 - ''', + """, }, requires_txt=DALS( - ''' + """ - foo bar baz @@ -56,5 +56,5 @@ Index: setuptools-69.0.2/setuptools/tests/test_wheel.py bazqux>5 + foobar>3 quxzap>6 - ''' + """ ),