91 lines
2.5 KiB
Diff
91 lines
2.5 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(-)
|
||
|
|
|
||
|
|
--- a/setuptools/command/easy_install.py
|
||
|
|
+++ b/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)):
|
||
|
|
--- a/setuptools/command/egg_info.py
|
||
|
|
+++ b/setuptools/command/egg_info.py
|
||
|
|
@@ -694,7 +694,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)
|
||
|
|
|
||
|
|
|
||
|
|
--- a/setuptools/dist.py
|
||
|
|
+++ b/setuptools/dist.py
|
||
|
|
@@ -221,7 +221,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 [])
|
||
|
|
--- a/setuptools/tests/test_egg_info.py
|
||
|
|
+++ b/setuptools/tests/test_egg_info.py
|
||
|
|
@@ -304,8 +304,8 @@ class TestEggInfo:
|
||
|
|
wheel>=0.5
|
||
|
|
pytest
|
||
|
|
|
||
|
|
- wheel>=0.5
|
||
|
|
pytest
|
||
|
|
+ wheel>=0.5
|
||
|
|
''',
|
||
|
|
|
||
|
|
'''
|
||
|
|
--- a/setuptools/tests/test_wheel.py
|
||
|
|
+++ b/setuptools/tests/test_wheel.py
|
||
|
|
@@ -423,30 +423,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
|
||
|
|
'''
|
||
|
|
),
|