Dirk Mueller
3d3625aa29
* 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. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=264
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
|
|
"""
|
|
),
|