[med-svn] [Git][med-team/mapping-pipeline][master] 3 commits: Fix permissions

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / mapping-pipeline


Commits:
19181f41 by Andreas Tille at 2017-02-23T14:23:37+01:00
Fix permissions

- - - - -
16509067 by Andreas Tille at 2017-02-24T08:50:46+01:00
Some fixes

- - - - -
36214226 by Andreas Tille at 2017-02-24T08:51:01+01:00
CWL-runner

- - - - -


6 changed files:

- + debian/cwl-runner/cwl-runner
- + debian/patches/path_to_report.tex.patch
- + debian/patches/picard.patch
- debian/patches/python3.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/cwl-runner/cwl-runner
=====================================
--- /dev/null
+++ b/debian/cwl-runner/cwl-runner
@@ -0,0 +1,11 @@
+#!/home/dabrowskiw/cwl/cwl_vw/bin/python3
+
+# -*- coding: utf-8 -*-
+import re
+import sys
+
+from cwltool.main import main
+
+if __name__ == '__main__':
+    sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
+    sys.exit(main())


=====================================
debian/patches/path_to_report.tex.patch
=====================================
--- /dev/null
+++ b/debian/patches/path_to_report.tex.patch
@@ -0,0 +1,15 @@
+--- a/mapping.py
++++ b/mapping.py
+@@ -134,10 +134,10 @@ class MAPPING:
+         # self.env = jinja2.Environment()
+         # self.env.loader = jinja2.FileSystemLoader('.')
+ 
+-        # self.template = self.env.get_template(os.path.join(os.path.dirname(__file__), 'report.tex'))
++        # self.template = self.env.get_template(os.path.join('/usr/share/mapping-pipeline', 'report.tex'))
+         # self.pdf_latex = self.template.render(pipeline=self, metric=self.metric)
+         template_dir = os.path.dirname(__file__) #'/usr/share/mapping-pipeline'
+-        template_file = 'report.tex'
++        template_file = '/usr/share/mapping-pipeline/report.tex'
+         loader = jinja2.FileSystemLoader(template_dir)
+         env = jinja2.Environment(loader=loader)
+         template = env.get_template(template_file)


=====================================
debian/patches/picard.patch
=====================================
--- /dev/null
+++ b/debian/patches/picard.patch
@@ -0,0 +1,11 @@
+--- a/mapping.py
++++ b/mapping.py
+@@ -390,7 +390,7 @@ class MAPPING:
+         self.args.reference = files
+ 
+     def _valid_picard(self, f):
+-        if os.path.isfile(os.path.join(os.path.realpath(f), 'picard.jar')):
++        if os.path.isfile(os.path.join('/usr/share/java', 'picard.jar')):
+             return f
+         else:
+             raise argparse.ArgumentTypeError('Cannot find picard.jar in folder {}'.format(os.path.realpath(f)))


=====================================
debian/patches/python3.patch
=====================================
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -7,14 +7,12 @@ Description: This script should not be called directly
 
 --- a/metrics.py
 +++ b/metrics.py
-@@ -1,6 +1,4 @@
+@@ -1,5 +1,3 @@
 -#!/usr/bin/env python
 -
--import custom_logger as log
-+from . import custom_logger as log
+ import custom_logger as log
  import numpy as np
  import matplotlib
- matplotlib.use('Agg')
 @@ -120,7 +118,7 @@ class METRICS:
                  self.reads_per_quality_result.append([os.path.realpath(os.path.join(self.output, 'reads_per_quality_{}.pdf'.format(valid_filename(reference)))), reference.replace('_','\_')])
                  fig, ax = plt.subplots( nrows=1, ncols=1 )  # create figure & 1 axis


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
 python3.patch
 config.patch
+picard.patch
+path_to_report.tex.patch


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -10,5 +10,5 @@ override_dh_fixperms:
 	find debian -name "*.tex" -exec chmod -x \{\} \;
 	find debian -name "*.json" -exec chmod -x \{\} \;
 	for py in `find debian -name "*.py"` ; do \
-	    if ! head -n 1 $$py | grep -q '^#!/usr/bin/python' ; then chmod -x $$py ; fi ; \
+	    if ! head -n 1 $$py | grep -q '^#! */usr/bin/.*python' ; then chmod -x $$py ; fi ; \
 	done



View it on GitLab: https://salsa.debian.org/med-team/mapping-pipeline/compare/124837ebe731976a79e8a88e36a721dc4bd12894...362142266a0d580638bfbefa7c9652cf05760cf2

---
View it on GitLab: https://salsa.debian.org/med-team/mapping-pipeline/compare/124837ebe731976a79e8a88e36a721dc4bd12894...362142266a0d580638bfbefa7c9652cf05760cf2
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/debian-med-commit/attachments/20180316/976f04ac/attachment-0001.html>