Changeset 2e40231

Timestamp:

Nov 28, 2016, 3:48:47 PM (7 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, sampler, yinfft+

Children:

bab8e3d

Parents:

3820264

git-author:

Paul Brossier <piem@piem.org> (11/28/16 15:48:34)

git-committer:

Paul Brossier <piem@piem.org> (11/28/16 15:48:47)

Message:

setup.py, python/lib/: use sorted glob.glob to improve reproducibility

Files:

• python/lib/gen_external.py (modified) (1 diff)
• python/lib/moresetuptools.py (modified) (1 diff)
• setup.py (modified) (1 diff)

python/lib/gen_external.py

@@ -175 +175 @@
 def generate_external(header=header, output_path=output_path, usedouble=False, overwrite=True):
     if not os.path.isdir(output_path): os.mkdir(output_path)
-    elif not overwrite: return glob.glob(os.path.join(output_path, '*.c'))
+    elif not overwrite: return sorted(glob.glob(os.path.join(output_path, '*.c')))
 
     cpp_output, cpp_objects = get_cpp_objects(header)

python/lib/moresetuptools.py

@@ -59 +59 @@
     fake_config_header = os.path.join('python', 'ext', 'config.h')
     distutils.file_util.write_file(fake_config_header, "")
-    aubio_sources = glob.glob(os.path.join('src', '**.c'))
-    aubio_sources += glob.glob(os.path.join('src', '*', '**.c'))
+    aubio_sources = sorted(glob.glob(os.path.join('src', '**.c')))
+    aubio_sources += sorted(glob.glob(os.path.join('src', '*', '**.c')))
     ext.sources += aubio_sources
     # define macros (waf puts them in build/src/config.h)

setup.py

@@ -38 +38 @@
     extra_link_args += ['-framework','CoreFoundation', '-framework','AudioToolbox']
 
-sources = glob.glob(os.path.join('python', 'ext', '*.c'))
+sources = sorted(glob.glob(os.path.join('python', 'ext', '*.c')))
 
 aubio_extension = Extension("aubio._aubio",