summaryrefslogtreecommitdiff
path: root/setuptools
diff options
context:
space:
mode:
authorDaniel Garcia Moreno <daniel.garcia@suse.com>2022-11-14 12:56:32 +0100
committerDaniel Garcia Moreno <daniel.garcia@suse.com>2022-11-15 08:16:40 +0100
commit95234bb9002dfb259d37125ae5382a404d0f5ab1 (patch)
tree6533e2d37a492b60ed59a9f6c183ab422c22e13b /setuptools
parenta0e8e53cecc238e3bce2247308fe7dd94114ef35 (diff)
downloadpython-setuptools-git-95234bb9002dfb259d37125ae5382a404d0f5ab1.tar.gz
Make clib build reproducible by sorting sources
Fix https://github.com/pypa/setuptools/issues/3678
Diffstat (limited to 'setuptools')
-rw-r--r--setuptools/command/build_clib.py2
-rw-r--r--setuptools/tests/test_build_clib.py28
2 files changed, 29 insertions, 1 deletions
diff --git a/setuptools/command/build_clib.py b/setuptools/command/build_clib.py
index 67ce2444..09483e69 100644
--- a/setuptools/command/build_clib.py
+++ b/setuptools/command/build_clib.py
@@ -28,7 +28,7 @@ class build_clib(orig.build_clib):
"in 'libraries' option (library '%s'), "
"'sources' must be present and must be "
"a list of source filenames" % lib_name)
- sources = list(sources)
+ sources = sorted(list(sources))
log.info("building '%s' library", lib_name)
diff --git a/setuptools/tests/test_build_clib.py b/setuptools/tests/test_build_clib.py
index af9e7c6d..2d9273cd 100644
--- a/setuptools/tests/test_build_clib.py
+++ b/setuptools/tests/test_build_clib.py
@@ -2,6 +2,7 @@ from unittest import mock
import pytest
+import random
from distutils.errors import DistutilsSetupError
from setuptools.command.build_clib import build_clib
from setuptools.dist import Distribution
@@ -56,3 +57,30 @@ class TestBuildCLib:
cmd.build_libraries(libs)
assert cmd.compiler.compile.call_count == 1
assert cmd.compiler.create_static_lib.call_count == 1
+
+ @mock.patch(
+ 'setuptools.command.build_clib.newer_pairwise_group')
+ def test_build_libraries_reproducible(self, mock_newer):
+ dist = Distribution()
+ cmd = build_clib(dist)
+
+ # with that out of the way, let's see if the crude dependency
+ # system works
+ cmd.compiler = mock.MagicMock(spec=cmd.compiler)
+ mock_newer.return_value = ([], [])
+
+ original_sources = ['a-example.c', 'example.c']
+ sources = original_sources
+
+ obj_deps = {'': ('global.h',), 'example.c': ('example.h',)}
+ libs = [('example', {'sources': sources, 'obj_deps': obj_deps})]
+
+ cmd.build_libraries(libs)
+ computed_call_args = mock_newer.call_args[0]
+
+ while sources == original_sources:
+ sources = random.sample(original_sources, len(original_sources))
+ libs = [('example', {'sources': sources, 'obj_deps': obj_deps})]
+
+ cmd.build_libraries(libs)
+ assert computed_call_args == mock_newer.call_args[0]