python/python-setuptools
SHA256
14
0
Fork 0
forked from pool/python-setuptools
Code Pull Requests Activity

- update to 58.3.0:

Browse Source 
*  ``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
This commit is contained in:
Dirk Mueller
2022-02-07 11:04:33 +00:00
committed by Git OBS Bridge
parent 2dc7434aec
commit 9b561131ed
7 changed files with 116 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
python-setuptools.changes
View File

@@ -1,3 +1,37 @@
-------------------------------------------------------------------
Mon Feb 7 10:59:43 UTC 2022 - Dirk Müller <dmueller@suse.com>
- 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
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Dec 23 11:42:19 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org> Thu Dec 23 11:42:19 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>

4
python-setuptools.spec
View File

@@ -1,7 +1,7 @@
# #
# spec file # spec file
# #
# Copyright (c) 2021 SUSE LLC # Copyright (c) 2022 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@@ -36,7 +36,7 @@
# in order to avoid rewriting for subpackage generator # in order to avoid rewriting for subpackage generator
%define mypython python %define mypython python
Name: python-setuptools%{psuffix} Name: python-setuptools%{psuffix}
Version: 57.4.0 Version: 58.3.0
Release: 0 Release: 0
Summary: Download, build, install, upgrade, and uninstall Python packages Summary: Download, build, install, upgrade, and uninstall Python packages
License: MIT License: MIT

52
remove-more-itertools-dependency-cycle.patch
View File

@@ -6,10 +6,10 @@ setuptools buildrequires more_itertools just for one simple function
in order to remove the cycle, the unique_everseen function is copied in order to remove the cycle, the unique_everseen function is copied
here so that it can be used without buildrequiring the external package. here so that it can be used without buildrequiring the external package.
Index: setuptools-57.0.0/setuptools/extern/__init__.py Index: setuptools-58.3.0/setuptools/extern/__init__.py
=================================================================== ===================================================================
--- setuptools-57.0.0.orig/setuptools/extern/__init__.py --- setuptools-58.3.0.orig/setuptools/extern/__init__.py
+++ setuptools-57.0.0/setuptools/extern/__init__.py +++ setuptools-58.3.0/setuptools/extern/__init__.py
@@ -69,5 +69,5 @@ class VendorImporter: @@ -69,5 +69,5 @@ class VendorImporter:
sys.meta_path.append(self) sys.meta_path.append(self)
@@ -17,10 +17,10 @@ Index: setuptools-57.0.0/setuptools/extern/__init__.py
-names = 'packaging', 'pyparsing', 'ordered_set', 'more_itertools', -names = 'packaging', 'pyparsing', 'ordered_set', 'more_itertools',
+names = 'packaging', 'pyparsing', 'ordered_set' +names = 'packaging', 'pyparsing', 'ordered_set'
VendorImporter(__name__, names, 'setuptools._vendor').install() VendorImporter(__name__, names, 'setuptools._vendor').install()
Index: setuptools-57.0.0/setuptools/dist.py Index: setuptools-58.3.0/setuptools/dist.py
=================================================================== ===================================================================
--- setuptools-57.0.0.orig/setuptools/dist.py --- setuptools-58.3.0.orig/setuptools/dist.py
+++ setuptools-57.0.0/setuptools/dist.py +++ setuptools-58.3.0/setuptools/dist.py
@@ -29,7 +29,7 @@ from distutils.version import StrictVers @@ -29,7 +29,7 @@ from distutils.version import StrictVers
from setuptools.extern import packaging from setuptools.extern import packaging
@@ -30,10 +30,10 @@ Index: setuptools-57.0.0/setuptools/dist.py
from . import SetuptoolsDeprecationWarning from . import SetuptoolsDeprecationWarning
Index: setuptools-57.0.0/setuptools/more_itertools.py Index: setuptools-58.3.0/setuptools/more_itertools.py
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ setuptools-57.0.0/setuptools/more_itertools.py +++ setuptools-58.3.0/setuptools/more_itertools.py
@@ -0,0 +1,19 @@ @@ -0,0 +1,19 @@
+def unique_everseen(iterable, key=None): +def unique_everseen(iterable, key=None):
+ """Yield unique elements, preserving order.""" + """Yield unique elements, preserving order."""
@@ -54,10 +54,10 @@ Index: setuptools-57.0.0/setuptools/more_itertools.py
+ if k not in seenlist: + if k not in seenlist:
+ seenlist_add(k) + seenlist_add(k)
+ yield element + yield element
Index: setuptools-57.0.0/setuptools/command/build_py.py Index: setuptools-58.3.0/setuptools/command/build_py.py
=================================================================== ===================================================================
--- setuptools-57.0.0.orig/setuptools/command/build_py.py --- setuptools-58.3.0.orig/setuptools/command/build_py.py
+++ setuptools-57.0.0/setuptools/command/build_py.py +++ setuptools-58.3.0/setuptools/command/build_py.py
@@ -8,7 +8,7 @@ import io @@ -8,7 +8,7 @@ import io
import distutils.errors import distutils.errors
import itertools import itertools
@@ -65,12 +65,12 @@ Index: setuptools-57.0.0/setuptools/command/build_py.py
-from setuptools.extern.more_itertools import unique_everseen -from setuptools.extern.more_itertools import unique_everseen
+from setuptools.more_itertools import unique_everseen +from setuptools.more_itertools import unique_everseen
try:
from setuptools.lib2to3_ex import Mixin2to3 def make_writable(target):
Index: setuptools-57.0.0/setuptools/msvc.py Index: setuptools-58.3.0/setuptools/msvc.py
=================================================================== ===================================================================
--- setuptools-57.0.0.orig/setuptools/msvc.py --- setuptools-58.3.0.orig/setuptools/msvc.py
+++ setuptools-57.0.0/setuptools/msvc.py +++ setuptools-58.3.0/setuptools/msvc.py
@@ -30,7 +30,7 @@ import itertools @@ -30,7 +30,7 @@ import itertools
import subprocess import subprocess
import distutils.errors import distutils.errors
@@ -80,11 +80,11 @@ Index: setuptools-57.0.0/setuptools/msvc.py
from .monkey import get_unpatched from .monkey import get_unpatched
Index: setuptools-57.0.0/setuptools/package_index.py Index: setuptools-58.3.0/setuptools/package_index.py
=================================================================== ===================================================================
--- setuptools-57.0.0.orig/setuptools/package_index.py --- setuptools-58.3.0.orig/setuptools/package_index.py
+++ setuptools-57.0.0/setuptools/package_index.py +++ setuptools-58.3.0/setuptools/package_index.py
@@ -28,7 +28,7 @@ from distutils import log @@ -27,7 +27,7 @@ from distutils import log
from distutils.errors import DistutilsError from distutils.errors import DistutilsError
from fnmatch import translate from fnmatch import translate
from setuptools.wheel import Wheel from setuptools.wheel import Wheel
@@ -93,13 +93,13 @@ Index: setuptools-57.0.0/setuptools/package_index.py
EGG_FRAGMENT = re.compile(r'^egg=([-A-Za-z0-9_.+!]+)$') EGG_FRAGMENT = re.compile(r'^egg=([-A-Za-z0-9_.+!]+)$')
Index: setuptools-57.0.0/setuptools/command/test.py Index: setuptools-58.3.0/setuptools/command/test.py
=================================================================== ===================================================================
--- setuptools-57.0.0.orig/setuptools/command/test.py --- setuptools-58.3.0.orig/setuptools/command/test.py
+++ setuptools-57.0.0/setuptools/command/test.py +++ setuptools-58.3.0/setuptools/command/test.py
@@ -12,7 +12,7 @@ from pkg_resources import (resource_list @@ -19,7 +19,7 @@ from pkg_resources import (
working_set, _namespace_packages, evaluate_marker, EntryPoint,
add_activation_listener, require, EntryPoint) )
from setuptools import Command from setuptools import Command
-from setuptools.extern.more_itertools import unique_everseen -from setuptools.extern.more_itertools import unique_everseen
+from setuptools.more_itertools import unique_everseen +from setuptools.more_itertools import unique_everseen

80
remove_mock.patch
View File

@@ -11,20 +11,20 @@
setuptools/tests/test_upload.py | 5 +---- setuptools/tests/test_upload.py | 5 +----
10 files changed, 13 insertions(+), 18 deletions(-) 10 files changed, 13 insertions(+), 18 deletions(-)
Index: setuptools-57.0.0/pkg_resources/tests/test_markers.py Index: setuptools-58.3.0/pkg_resources/tests/test_markers.py
=================================================================== ===================================================================
--- setuptools-57.0.0.orig/pkg_resources/tests/test_markers.py --- setuptools-58.3.0.orig/pkg_resources/tests/test_markers.py
+++ setuptools-57.0.0/pkg_resources/tests/test_markers.py +++ setuptools-58.3.0/pkg_resources/tests/test_markers.py
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-import mock -import mock
+from . import mock +from . import mock
from pkg_resources import evaluate_marker from pkg_resources import evaluate_marker
Index: setuptools-57.0.0/pkg_resources/tests/test_pkg_resources.py Index: setuptools-58.3.0/pkg_resources/tests/test_pkg_resources.py
=================================================================== ===================================================================
--- setuptools-57.0.0.orig/pkg_resources/tests/test_pkg_resources.py --- setuptools-58.3.0.orig/pkg_resources/tests/test_pkg_resources.py
+++ setuptools-57.0.0/pkg_resources/tests/test_pkg_resources.py +++ setuptools-58.3.0/pkg_resources/tests/test_pkg_resources.py
@@ -9,10 +9,7 @@ import stat @@ -9,10 +9,7 @@ import stat
import distutils.dist import distutils.dist
import distutils.command.install_egg_info import distutils.command.install_egg_info
@@ -37,13 +37,13 @@ Index: setuptools-57.0.0/pkg_resources/tests/test_pkg_resources.py
from pkg_resources import ( from pkg_resources import (
DistInfoDistribution, Distribution, EggInfoDistribution, DistInfoDistribution, Distribution, EggInfoDistribution,
Index: setuptools-57.0.0/setuptools/tests/__init__.py Index: setuptools-58.3.0/setuptools/tests/__init__.py
=================================================================== ===================================================================
--- setuptools-57.0.0.orig/setuptools/tests/__init__.py --- setuptools-58.3.0.orig/setuptools/tests/__init__.py
+++ setuptools-57.0.0/setuptools/tests/__init__.py +++ setuptools-58.3.0/setuptools/tests/__init__.py
@@ -5,6 +5,10 @@ import pytest @@ -5,6 +5,10 @@ import pytest
__all__ = ['fail_on_ascii', 'ack_2to3'] __all__ = ['fail_on_ascii']
+try: +try:
+ import mock + import mock
@@ -52,10 +52,10 @@ Index: setuptools-57.0.0/setuptools/tests/__init__.py
is_ascii = locale.getpreferredencoding() == 'ANSI_X3.4-1968' is_ascii = locale.getpreferredencoding() == 'ANSI_X3.4-1968'
fail_on_ascii = pytest.mark.xfail(is_ascii, reason="Test fails in this locale") fail_on_ascii = pytest.mark.xfail(is_ascii, reason="Test fails in this locale")
Index: setuptools-57.0.0/setuptools/tests/test_build_clib.py Index: setuptools-58.3.0/setuptools/tests/test_build_clib.py
=================================================================== ===================================================================
--- setuptools-57.0.0.orig/setuptools/tests/test_build_clib.py --- setuptools-58.3.0.orig/setuptools/tests/test_build_clib.py
+++ setuptools-57.0.0/setuptools/tests/test_build_clib.py +++ setuptools-58.3.0/setuptools/tests/test_build_clib.py
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
import pytest import pytest
@@ -64,10 +64,10 @@ Index: setuptools-57.0.0/setuptools/tests/test_build_clib.py
from distutils.errors import DistutilsSetupError from distutils.errors import DistutilsSetupError
from setuptools.command.build_clib import build_clib from setuptools.command.build_clib import build_clib
from setuptools.dist import Distribution from setuptools.dist import Distribution
Index: setuptools-57.0.0/setuptools/tests/test_easy_install.py Index: setuptools-58.3.0/setuptools/tests/test_easy_install.py
=================================================================== ===================================================================
--- setuptools-57.0.0.orig/setuptools/tests/test_easy_install.py --- setuptools-58.3.0.orig/setuptools/tests/test_easy_install.py
+++ setuptools-57.0.0/setuptools/tests/test_easy_install.py +++ setuptools-58.3.0/setuptools/tests/test_easy_install.py
@@ -12,7 +12,7 @@ import itertools @@ -12,7 +12,7 @@ import itertools
import distutils.errors import distutils.errors
import io import io
@@ -77,10 +77,10 @@ Index: setuptools-57.0.0/setuptools/tests/test_easy_install.py
import time import time
import re import re
import subprocess import subprocess
Index: setuptools-57.0.0/setuptools/tests/test_msvc.py Index: setuptools-58.3.0/setuptools/tests/test_msvc.py
=================================================================== ===================================================================
--- setuptools-57.0.0.orig/setuptools/tests/test_msvc.py --- setuptools-58.3.0.orig/setuptools/tests/test_msvc.py
+++ setuptools-57.0.0/setuptools/tests/test_msvc.py +++ setuptools-58.3.0/setuptools/tests/test_msvc.py
@@ -5,7 +5,7 @@ Tests for msvc support module. @@ -5,7 +5,7 @@ Tests for msvc support module.
import os import os
import contextlib import contextlib
@@ -90,10 +90,10 @@ Index: setuptools-57.0.0/setuptools/tests/test_msvc.py
import pytest import pytest
Index: setuptools-57.0.0/setuptools/tests/test_packageindex.py Index: setuptools-58.3.0/setuptools/tests/test_packageindex.py
=================================================================== ===================================================================
--- setuptools-57.0.0.orig/setuptools/tests/test_packageindex.py --- setuptools-58.3.0.orig/setuptools/tests/test_packageindex.py
+++ setuptools-57.0.0/setuptools/tests/test_packageindex.py +++ setuptools-58.3.0/setuptools/tests/test_packageindex.py
@@ -6,7 +6,7 @@ import urllib.request @@ -6,7 +6,7 @@ import urllib.request
import urllib.error import urllib.error
import http.client import http.client
@@ -103,10 +103,10 @@ Index: setuptools-57.0.0/setuptools/tests/test_packageindex.py
import pytest import pytest
import setuptools.package_index import setuptools.package_index
Index: setuptools-57.0.0/setuptools/tests/test_register.py Index: setuptools-58.3.0/setuptools/tests/test_register.py
=================================================================== ===================================================================
--- setuptools-57.0.0.orig/setuptools/tests/test_register.py --- setuptools-58.3.0.orig/setuptools/tests/test_register.py
+++ setuptools-57.0.0/setuptools/tests/test_register.py +++ setuptools-58.3.0/setuptools/tests/test_register.py
@@ -2,10 +2,7 @@ from setuptools.command.register import @@ -2,10 +2,7 @@ from setuptools.command.register import
from setuptools.dist import Distribution from setuptools.dist import Distribution
from setuptools.errors import RemovedCommandError from setuptools.errors import RemovedCommandError
@@ -119,20 +119,10 @@ Index: setuptools-57.0.0/setuptools/tests/test_register.py
import pytest import pytest
Index: setuptools-57.0.0/setuptools/tests/test_test.py Index: setuptools-58.3.0/setuptools/tests/test_upload.py
=================================================================== ===================================================================
--- setuptools-57.0.0.orig/setuptools/tests/test_test.py --- setuptools-58.3.0.orig/setuptools/tests/test_upload.py
+++ setuptools-57.0.0/setuptools/tests/test_test.py +++ setuptools-58.3.0/setuptools/tests/test_upload.py
@@ -1,4 +1,4 @@
-import mock
+from . import mock
from distutils import log
import os
Index: setuptools-57.0.0/setuptools/tests/test_upload.py
===================================================================
--- setuptools-57.0.0.orig/setuptools/tests/test_upload.py
+++ setuptools-57.0.0/setuptools/tests/test_upload.py
@@ -2,10 +2,7 @@ from setuptools.command.upload import up @@ -2,10 +2,7 @@ from setuptools.command.upload import up
from setuptools.dist import Distribution from setuptools.dist import Distribution
from setuptools.errors import RemovedCommandError from setuptools.errors import RemovedCommandError
@@ -145,10 +135,10 @@ Index: setuptools-57.0.0/setuptools/tests/test_upload.py
import pytest import pytest
Index: setuptools-57.0.0/setuptools/tests/test_config.py Index: setuptools-58.3.0/setuptools/tests/test_config.py
=================================================================== ===================================================================
--- setuptools-57.0.0.orig/setuptools/tests/test_config.py --- setuptools-58.3.0.orig/setuptools/tests/test_config.py
+++ setuptools-57.0.0/setuptools/tests/test_config.py +++ setuptools-58.3.0/setuptools/tests/test_config.py
@@ -7,7 +7,7 @@ import configparser @@ -7,7 +7,7 @@ import configparser
import pytest import pytest
@@ -158,8 +148,8 @@ Index: setuptools-57.0.0/setuptools/tests/test_config.py
from setuptools.dist import Distribution, _Distribution from setuptools.dist import Distribution, _Distribution
from setuptools.config import ConfigHandler, read_configuration from setuptools.config import ConfigHandler, read_configuration
from distutils.core import Command from distutils.core import Command
@@ -974,7 +974,7 @@ class TestExternalSetters: @@ -906,7 +906,7 @@ class TestExternalSetters:
}) )
return None return None
- @patch.object(_Distribution, '__init__', autospec=True) - @patch.object(_Distribution, '__init__', autospec=True)
@@ -167,10 +157,10 @@ Index: setuptools-57.0.0/setuptools/tests/test_config.py
def test_external_setters(self, mock_parent_init, tmpdir): def test_external_setters(self, mock_parent_init, tmpdir):
mock_parent_init.side_effect = self._fake_distribution_init mock_parent_init.side_effect = self._fake_distribution_init
Index: setuptools-57.0.0/pkg_resources/tests/__init__.py Index: setuptools-58.3.0/pkg_resources/tests/__init__.py
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ setuptools-57.0.0/pkg_resources/tests/__init__.py +++ setuptools-58.3.0/pkg_resources/tests/__init__.py
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
+try: +try:
+ import mock + import mock

3
setuptools-57.4.0.tar.gz
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6bac238ffdf24e8806c61440e755192470352850f3419a52f26ffe0a1a64f465
size 2141309

3
setuptools-58.3.0.tar.gz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b0c2461641b58fe30e11d4c3dfba316c513bdf9ec85f9fed0c871c678447205e
size 2268278

32
sort-for-reproducibility.patch
View File

@@ -1,8 +1,8 @@
Index: setuptools-57.0.0/setuptools/command/easy_install.py Index: setuptools-58.3.0/setuptools/command/easy_install.py
=================================================================== ===================================================================
--- setuptools-57.0.0.orig/setuptools/command/easy_install.py --- setuptools-58.3.0.orig/setuptools/command/easy_install.py
+++ setuptools-57.0.0/setuptools/command/easy_install.py +++ setuptools-58.3.0/setuptools/command/easy_install.py
@@ -407,7 +407,7 @@ class easy_install(Command): @@ -413,7 +413,7 @@ class easy_install(Command):
for spec in self.args: for spec in self.args:
self.easy_install(spec, not self.no_deps) self.easy_install(spec, not self.no_deps)
if self.record: if self.record:
@@ -11,10 +11,10 @@ Index: setuptools-57.0.0/setuptools/command/easy_install.py
if self.root: # strip any package prefix if self.root: # strip any package prefix
root_len = len(self.root) root_len = len(self.root)
for counter in range(len(outputs)): for counter in range(len(outputs)):
Index: setuptools-57.0.0/setuptools/command/egg_info.py Index: setuptools-58.3.0/setuptools/command/egg_info.py
=================================================================== ===================================================================
--- setuptools-57.0.0.orig/setuptools/command/egg_info.py --- setuptools-58.3.0.orig/setuptools/command/egg_info.py
+++ setuptools-57.0.0/setuptools/command/egg_info.py +++ setuptools-58.3.0/setuptools/command/egg_info.py
@@ -654,7 +654,7 @@ def _write_requirements(stream, reqs): @@ -654,7 +654,7 @@ def _write_requirements(stream, reqs):
def append_cr(line): def append_cr(line):
@@ -24,23 +24,23 @@ Index: setuptools-57.0.0/setuptools/command/egg_info.py
stream.writelines(lines) stream.writelines(lines)
Index: setuptools-57.0.0/setuptools/dist.py Index: setuptools-58.3.0/setuptools/dist.py
=================================================================== ===================================================================
--- setuptools-57.0.0.orig/setuptools/dist.py --- setuptools-58.3.0.orig/setuptools/dist.py
+++ setuptools-57.0.0/setuptools/dist.py +++ setuptools-58.3.0/setuptools/dist.py
@@ -214,7 +214,7 @@ def write_pkg_file(self, file): # noqa: @@ -208,7 +208,7 @@ def write_pkg_file(self, file): # noqa:
self.long_description_content_type if self.long_description_content_type:
) write_field('Description-Content-Type', self.long_description_content_type)
if self.provides_extras: if self.provides_extras:
- for extra in self.provides_extras: - for extra in self.provides_extras:
+ for extra in sorted(self.provides_extras): + for extra in sorted(self.provides_extras):
write_field('Provides-Extra', extra) write_field('Provides-Extra', extra)
self._write_list(file, 'License-File', self.license_files or []) self._write_list(file, 'License-File', self.license_files or [])
Index: setuptools-57.0.0/setuptools/tests/test_egg_info.py Index: setuptools-58.3.0/setuptools/tests/test_egg_info.py
=================================================================== ===================================================================
--- setuptools-57.0.0.orig/setuptools/tests/test_egg_info.py --- setuptools-58.3.0.orig/setuptools/tests/test_egg_info.py
+++ setuptools-57.0.0/setuptools/tests/test_egg_info.py +++ setuptools-58.3.0/setuptools/tests/test_egg_info.py
@@ -297,8 +297,8 @@ class TestEggInfo: @@ -297,8 +297,8 @@ class TestEggInfo:
wheel>=0.5 wheel>=0.5
pytest pytest