54b60876e3
* 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
61 lines
1.8 KiB
Diff
61 lines
1.8 KiB
Diff
---
|
|
setuptools/command/easy_install.py | 2 +-
|
|
setuptools/command/egg_info.py | 2 +-
|
|
setuptools/dist.py | 2 +-
|
|
setuptools/tests/test_egg_info.py | 2 +-
|
|
setuptools/tests/test_wheel.py | 8 ++++----
|
|
5 files changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
Index: setuptools-70.0.0/setuptools/command/easy_install.py
|
|
===================================================================
|
|
--- 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:
|
|
- outputs = self.outputs
|
|
+ outputs = list(sorted(self.outputs))
|
|
if self.root: # strip any package prefix
|
|
root_len = len(self.root)
|
|
for counter in range(len(outputs)):
|
|
Index: setuptools-70.0.0/setuptools/tests/test_wheel.py
|
|
===================================================================
|
|
--- 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="""
|
|
- foo
|
|
bar
|
|
baz
|
|
+ foo
|
|
qux
|
|
""",
|
|
extras_require={
|
|
'extra': """
|
|
- foobar>3
|
|
barbaz>4
|
|
bazqux>5
|
|
+ foobar>3
|
|
quxzap>6
|
|
""",
|
|
},
|
|
requires_txt=DALS(
|
|
"""
|
|
- foo
|
|
bar
|
|
baz
|
|
+ foo
|
|
qux
|
|
|
|
[extra]
|
|
- foobar>3
|
|
barbaz>4
|
|
bazqux>5
|
|
+ foobar>3
|
|
quxzap>6
|
|
"""
|
|
),
|