[med-svn] [cwltool] 04/06: new upstream release

[Michael Crusoe]

This is an automated email from the git hooks/post-receive script.

misterc-guest pushed a commit to branch master
in repository cwltool.

commit 585160ce6d494566c3f377553ae71e8c009b362b
Author: Michael R. Crusoe <michael.crusoe at gmail.com>
Date:   Thu Jan 12 00:23:53 2017 -0800

    new upstream release
---
 debian/changelog                                     |  2 +-
 debian/patches/ignore_cwltest.patch                  | 18 ++++++++----------
 debian/patches/no-typing                             | 20 --------------------
 debian/patches/series                                |  2 +-
 debian/patches/use_debian_packaged_ruamel.yaml.patch | 12 ------------
 debian/rules                                         |  6 +++---
 6 files changed, 13 insertions(+), 47 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8ac796e..fdb6302 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-cwltool (1.0.20161216212910-1) UNRELEASED; urgency=medium
+cwltool (1.0.20170111193653-1) UNRELEASED; urgency=medium
 
   * Team upload
 
diff --git a/debian/patches/ignore_cwltest.patch b/debian/patches/ignore_cwltest.patch
index 2c73a0c..a56a04d 100644
--- a/debian/patches/ignore_cwltest.patch
+++ b/debian/patches/ignore_cwltest.patch
@@ -4,15 +4,13 @@ Description: Ignore cwltest for the moment
  See the hint in
    https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=845982#62
 
---- a/setup.py
-+++ b/setup.py
-@@ -48,8 +48,7 @@ setup(name='cwltool',
-           'rdflib >= 4.2.0, < 4.3.0',
-           'shellescape',
-           'schema-salad >= 1.21.20161206204028, < 2',
--          'typing >= 3.5.2',
--          'cwltest >= 1.0.20160907111242'],
-+          'typing >= 3.5.2'],
+--- cwltool.orig/setup.py
++++ cwltool/setup.py
+@@ -49,7 +49,6 @@
+           'shellescape >= 3.4.1, < 3.5',
+           'schema-salad >= 2.2.20170111180227, < 3',
+           'typing >= 3.5.2, < 3.6',
+-          'cwltest >= 1.0.20161227194859'
+       ],
        test_suite='tests',
        tests_require=[],
-       entry_points={
diff --git a/debian/patches/no-typing b/debian/patches/no-typing
deleted file mode 100644
index 52b9abd..0000000
--- a/debian/patches/no-typing
+++ /dev/null
@@ -1,20 +0,0 @@
-Author: Michael R. Crusoe <michael.crusoe at gmail.com>
-Description: Skip typing
---- a/setup.py
-+++ b/setup.py
-@@ -48,7 +48,6 @@ setup(name='cwltool',
-           'rdflib >= 4.2.0, < 4.3.0',
-           'shellescape',
-           'schema-salad >= 1.21.20161206204028, < 2',
--          'typing >= 3.5.2',
-           'cwltest >= 1.0.20160907111242'],
-       test_suite='tests',
-       tests_require=[],
---- a/cwltool.egg-info/requires.txt
-+++ b/cwltool.egg-info/requires.txt
-@@ -4,5 +4,4 @@ ruamel.yaml == 0.12.4
- rdflib >= 4.2.0, < 4.3.0
- shellescape
- schema-salad >= 1.21.20161206204028, < 2
--typing >= 3.5.2
- cwltest >= 1.0.20160907111242
diff --git a/debian/patches/series b/debian/patches/series
index 6131204..cab0b92 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
 # no-typing
 ignore_cwltest.patch
-use_debian_packaged_ruamel.yaml.patch
+# use_debian_packaged_ruamel.yaml.patch
diff --git a/debian/patches/use_debian_packaged_ruamel.yaml.patch b/debian/patches/use_debian_packaged_ruamel.yaml.patch
deleted file mode 100644
index 3df2fbd..0000000
--- a/debian/patches/use_debian_packaged_ruamel.yaml.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -148,9 +148,6 @@ list-author-emails:
- 
- 
- mypy: ${PYSOURCES}
--	rm -Rf typeshed/2.7/ruamel/yaml
--	ln -s $(shell python -c 'from __future__ import print_function; import ruamel.yaml; import os.path; print(os.path.dirname(ruamel.yaml.__file__))') \
--		typeshed/2.7/ruamel/yaml
- 	rm -Rf typeshed/2.7/schema_salad
- 	ln -s $(shell python -c 'from __future__ import print_function; import schema_salad; import os.path; print(os.path.dirname(schema_salad.__file__))') \
- 		typeshed/2.7/schema_salad
diff --git a/debian/rules b/debian/rules
index dba593b..b79d313 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,13 +10,13 @@ export HOME=$(shell echo $$PWD"/fakehome")
 	dh $@ --with python2 --buildsystem=pybuild
 
 override_dh_auto_build:
-	find cwltool -name "*.py" | xargs sed -i 's/.*typing.*/#&/g'
+	#find cwltool -name "*.py" | xargs sed -i 's/.*typing.*/#&/g'
 	dh_auto_build
 
 debian/cwltool.1: debian/rules debian/cwltool.help2man
 	python2 setup.py develop --user
 	#help2man cwltool/main.py -I debian/cwltool.help2man -N -n "Reference executor for Common Workflow Language" -o debian/cwltool.1
-	help2man cwltool/main.py -I debian/cwltool.help2man -N -o debian/cwltool.1
+	help2man 'python -m cwltool' -I debian/cwltool.help2man -N -o debian/cwltool.1
 
 override_dh_installman: debian/cwltool.1
 	dh_installman
@@ -24,4 +24,4 @@ override_dh_installman: debian/cwltool.1
 override_dh_clean:
 	dh_clean
 	rm -f debian/cwltool.1
-	find cwltool -name "*.py" | xargs sed -i 's/#\(.*typing.*\)/\1/g'
+	#find cwltool -name "*.py" | xargs sed -i 's/#\(.*typing.*\)/\1/g'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/cwltool.git