python-setuptools/sort-for-reproducibility.patch

101 lines
3.4 KiB
Diff
Raw Normal View History

---
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-68.1.0/setuptools/command/easy_install.py
===================================================================
--- setuptools-68.1.0.orig/setuptools/command/easy_install.py
+++ setuptools-68.1.0/setuptools/command/easy_install.py
@@ -441,7 +441,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-68.1.0/setuptools/command/egg_info.py
===================================================================
--- setuptools-68.1.0.orig/setuptools/command/egg_info.py
+++ setuptools-68.1.0/setuptools/command/egg_info.py
@@ -698,7 +698,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-68.1.0/setuptools/dist.py
===================================================================
--- setuptools-68.1.0.orig/setuptools/dist.py
+++ setuptools-68.1.0/setuptools/dist.py
@@ -215,7 +215,7 @@ def write_pkg_file(self, file): # noqa:
- update to 58.3.0: * ``setup.py install`` and ``easy_install`` commands are now officially deprecated. Use other standards-based installers (like pip) and builders (like build). Workloads reliant on this behavior should pin to this major version of Setuptools. * #1988: Deprecated the ``bdist_rpm`` command. * #2785: Replace confirparser's readfp with read_file, deprecated since Python 3.2. * #2823: Officially deprecated support for ``setup_requires``. Users are encouraged instead to migrate to PEP 518 ``build-system.requires`` in ``pyproject.toml``. Users reliant on ``setup_requires`` should consider pinning to this major version to avoid disruption. * #2762: Changed codecov.yml to configure the threshold to be lower * #2757: Add windows arm64 launchers for scripts generated by easy_install. * #2800: Added ``--owner`` and ``--group`` options to the ``sdist`` command, for specifying file ownership within the produced tarball (similarly to the corresponding distutils ``sdist`` options). * #2792: Document how the legacy and non-legacy versions are compared, and reference to the `PEP 440 <https://www.python.org/dev/peps/pep-0440/>`_ scheme. * #2773: Retain case in setup.cfg during sdist. * #2777: Build does not fail fast when ``use_2to3`` is supplied but set to a false value. * #2769: Build now fails fast when ``use_2to3`` is supplied. * #2765: In Distribution.finalize_options, suppress known removed entry points to avoid issues with older Setuptools. * #2086: Removed support for 2to3 during builds. Projects should port to a unified codebase or pin to an older version of Setuptools using PEP 518 build-requires. * #2712: Added implicit globbing support for `[options.data_files]` values. * #2737: fix various syntax and style errors in code snippets in docs OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=220
2022-02-07 12:04:33 +01:00
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-68.1.0/setuptools/tests/test_egg_info.py
===================================================================
--- setuptools-68.1.0.orig/setuptools/tests/test_egg_info.py
+++ setuptools-68.1.0/setuptools/tests/test_egg_info.py
@@ -353,8 +353,8 @@ class TestEggInfo:
wheel>=0.5
pytest
- wheel>=0.5
pytest
+ wheel>=0.5
''',
'''
install_requires_ordered
Index: setuptools-68.1.0/setuptools/tests/test_wheel.py
===================================================================
--- setuptools-68.1.0.orig/setuptools/tests/test_wheel.py
+++ setuptools-68.1.0/setuptools/tests/test_wheel.py
@@ -424,30 +424,30 @@ WHEEL_INSTALL_TESTS = (
Accepting request 989053 from home:bnavigator:branches:devel:languages:python - 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
2022-07-14 10:12:35 +02:00
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
'''
),