[med-svn] [Git][med-team/snakemake][master] 2 commits: Add patch to make build reproducible

[Nilesh Patra (@nilesh)]

Nilesh Patra pushed to branch master at Debian Med / snakemake


Commits:
b0b520f5 by Nilesh Patra at 2021-10-24T00:17:52+05:30
Add patch to make build reproducible

- - - - -
b1f80753 by Nilesh Patra at 2021-10-24T00:26:49+05:30
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/reproducible-build.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+snakemake (6.9.1+dfsg1-4) unstable; urgency=medium
+
+  * Team Upload.
+  * Add patch to make build reproducible (Closes: #997000)
+    + Thanks to Chris Lamb!
+
+ -- Nilesh Patra <nilesh at debian.org>  Sun, 24 Oct 2021 00:18:19 +0530
+
 snakemake (6.9.1+dfsg1-3) unstable; urgency=medium
 
   * Team Upload.


=====================================
debian/patches/reproducible-build.patch
=====================================
@@ -0,0 +1,33 @@
+Description: Make the build reproducible
+Author: Chris Lamb <lamby at debian.org>
+Last-Update: 2021-10-22
+
+--- snakemake-6.9.1+dfsg1.orig/snakemake/dag.py
++++ snakemake-6.9.1+dfsg1/snakemake/dag.py
+@@ -1781,7 +1781,7 @@ class DAG:
+         huefactor = 2 / (3 * len(self.rules))
+         rulecolor = {
+             rule: "{:.2f} 0.6 0.85".format(i * huefactor)
+-            for i, rule in enumerate(self.rules)
++            for i, rule in sorted(enumerate(self.rules))
+         }
+ 
+         # markup
+@@ -1850,7 +1850,7 @@ class DAG:
+         huefactor = 2 / (3 * len(self.rules))
+         rulecolor = {
+             rule: hsv_to_htmlhexrgb(i * huefactor, 0.6, 0.85)
+-            for i, rule in enumerate(self.rules)
++            for i, rule in sorted(enumerate(self.rules))
+         }
+ 
+         def resolve_input_functions(input_files):
+@@ -1956,7 +1956,7 @@ class DAG:
+             {items}
+             }}\
+             """
+-        ).format(items="\n".join(nodes + edges))
++        ).format(items="\n".join(sorted(nodes) + sorted(edges)))
+ 
+     def summary(self, detailed=False):
+         if detailed:


=====================================
debian/patches/series
=====================================
@@ -9,3 +9,4 @@ remove_ccbysa_snippets.patch
 fix_test_pytest.patch
 python2to3.patch
 hack-around-connectionpool.patch
+reproducible-build.patch


=====================================
debian/rules
=====================================
@@ -28,7 +28,7 @@ TESTPACKAGE=snakemake
 # Skipped in build due to network use, but run in autopkgtest: test_ancient
 # Tests marked @connected skip themselves in this case
 
-export PYBUILD_AFTER_TEST_python3=rm -fr {build_dir}/bin {build_dir}/tests {dir}/tests/test_filegraph/.snakemake/ {dir}/tests/linting/*/.snakemake/
+export PYBUILD_AFTER_TEST_python3=rm -fr {build_dir}/bin {build_dir}/tests {dir}/tests/test_filegraph/.snakemake/ {dir}/tests/linting/*/.snakemake/ {dir}/tests/test_filegraph/fg.pdf
 
 export PATH:=$(shell pybuild --print build_dir --interpreter python3 --name $(PYBUILD_NAME))/bin:$(PATH)
 



View it on GitLab: https://salsa.debian.org/med-team/snakemake/-/compare/45194af8ac30347d7357125fe51460b36d78ff3c...b1f807539d0a727e9ccdc3844f6df4b0deffdac5

-- 
View it on GitLab: https://salsa.debian.org/med-team/snakemake/-/compare/45194af8ac30347d7357125fe51460b36d78ff3c...b1f807539d0a727e9ccdc3844f6df4b0deffdac5
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20211023/3f09912e/attachment-0001.htm>