Matej Cepl
520bb94f3d
- Update to version 63.1.0 * #3430: Merge with pypa/distutils@152c13d including pypa/distutils#155 (improved compatibility for editable installs on homebrew Python 3.9), pypa/distutils#150 (better handling of runtime_library_dirs on cygwin), and pypa/distutils#151 (remove warnings for namespace packages). - v63.0.0 * #3421: Drop setuptools' support for installing an entrypoint extra requirements at load time: - the functionality has been broken since v60.8.0. - the mechanism to do so is deprecated (fetch_build_eggs). - that use case (e.g. a custom command class entrypoint) is covered by making sure the necessary build requirements are declared. Documentation changes * #3397: Fix reference for keywords to point to the Core Metadata Specification instead of PEP 314 (the live standard is kept always up-to-date and consolidates several PEPs together in a single document). - v62.6.0 * #3253: Enabled using file: for requirements in setup.cfg -- by :user:`akx` (this feature is currently considered to be in beta stage). * #3255: Enabled using file: for dependencies and optional-dependencies in pyproject.toml -- by :user:`akx` (this feature is currently considered to be in beta stage). * #3391: Updated attr: to also extract simple constants with type annotations -- by :user:`karlotness` - v62.5.0 * #3347: Changed warnings and documentation notes about experimental aspect of pyproject.toml configuration: now OBS-URL: https://build.opensuse.org/request/show/989053 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=223
93 lines
3.0 KiB
Diff
93 lines
3.0 KiB
Diff
Index: setuptools-63.1.0/setuptools/command/easy_install.py
|
|
===================================================================
|
|
--- setuptools-63.1.0.orig/setuptools/command/easy_install.py
|
|
+++ setuptools-63.1.0/setuptools/command/easy_install.py
|
|
@@ -419,7 +419,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-63.1.0/setuptools/command/egg_info.py
|
|
===================================================================
|
|
--- setuptools-63.1.0.orig/setuptools/command/egg_info.py
|
|
+++ setuptools-63.1.0/setuptools/command/egg_info.py
|
|
@@ -683,7 +683,7 @@ def _write_requirements(stream, reqs):
|
|
|
|
def append_cr(line):
|
|
return line + '\n'
|
|
- lines = map(append_cr, lines)
|
|
+ lines = map(append_cr, sorted(lines))
|
|
stream.writelines(lines)
|
|
|
|
|
|
Index: setuptools-63.1.0/setuptools/dist.py
|
|
===================================================================
|
|
--- setuptools-63.1.0.orig/setuptools/dist.py
|
|
+++ setuptools-63.1.0/setuptools/dist.py
|
|
@@ -222,7 +222,7 @@ def write_pkg_file(self, file): # noqa:
|
|
if self.long_description_content_type:
|
|
write_field('Description-Content-Type', self.long_description_content_type)
|
|
if self.provides_extras:
|
|
- for extra in self.provides_extras:
|
|
+ for extra in sorted(self.provides_extras):
|
|
write_field('Provides-Extra', extra)
|
|
|
|
self._write_list(file, 'License-File', self.license_files or [])
|
|
Index: setuptools-63.1.0/setuptools/tests/test_egg_info.py
|
|
===================================================================
|
|
--- setuptools-63.1.0.orig/setuptools/tests/test_egg_info.py
|
|
+++ setuptools-63.1.0/setuptools/tests/test_egg_info.py
|
|
@@ -297,8 +297,8 @@ class TestEggInfo:
|
|
wheel>=0.5
|
|
pytest
|
|
|
|
- wheel>=0.5
|
|
pytest
|
|
+ wheel>=0.5
|
|
''',
|
|
|
|
'''
|
|
Index: setuptools-63.1.0/setuptools/tests/test_wheel.py
|
|
===================================================================
|
|
--- setuptools-63.1.0.orig/setuptools/tests/test_wheel.py
|
|
+++ setuptools-63.1.0/setuptools/tests/test_wheel.py
|
|
@@ -425,30 +425,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
|
|
'''
|
|
),
|