[med-svn] [Git][med-team/cwltool][master] 3 commits: nodoc support, more nocheck support

[Michael R. Crusoe]

Michael R. Crusoe pushed to branch master at Debian Med / cwltool


Commits:
988e7ed8 by Michael R. Crusoe at 2019-01-19T12:29:45Z
nodoc support, more nocheck support

- - - - -
8990049b by Michael R. Crusoe at 2019-01-19T12:29:46Z
AutoPkgTest: Skip udocker tests if running as root

- - - - -
24c27c36 by Michael R. Crusoe at 2019-01-19T12:35:48Z
upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/rules
- debian/tests/run-tests


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+cwltool (1.0.20181217162649+dfsg-9) unstable; urgency=medium
+
+  * Switch to python3-mypy-extensions
+  * AutoPkgTest: Skip udocker tests if running as root
+  * Build profiles: nodoc support, more nocheck support
+
+ -- Michael R. Crusoe <michael.crusoe at gmail.com>  Sat, 19 Jan 2019 04:35:36 -0800
+
 cwltool (1.0.20181217162649+dfsg-8) unstable; urgency=medium
 
   * debian/tests/control: udocker test needs python2


=====================================
debian/control
=====================================
@@ -9,19 +9,19 @@ Build-Depends: debhelper (>= 10),
                python3-all,
                python3-setuptools,
                python3-rdflib,
-               python3-rdflib-jsonld,
+               python3-rdflib-jsonld <!nocheck>,
                python3-schema-salad (>= 3),
                python3-shellescape,
                python3-html5lib,
                python3-sparqlwrapper,
                python3-keepalive,
                python3-ruamel.yaml,
-               python3-pytest,
-               python3-pytest-xdist,
-               python3-pytest-runner,
-	       python3-pytest-mock,
-               python3-mock,
-               python3-mypy,
+               python3-pytest <!nocheck>,
+               python3-pytest-xdist <!nocheck>,
+               python3-pytest-runner <!nocheck>,
+	       python3-pytest-mock <!nocheck>,
+               python3-mock <!nocheck>,
+               python3-mypy-extensions,
                python3-psutil,
 	       python3-prov,
                nodejs,


=====================================
debian/rules
=====================================
@@ -15,8 +15,12 @@ debian/cwltool.1: debian/rules debian/cwltool.help2man
 		-o debian/cwltool.1  'python3 -m cwltool'
 	sed -i 's/__main__.py/cwltool/g' debian/cwltool.1
 
+ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
 override_dh_installman: debian/cwltool.1
 	dh_installman
+else
+override_dh_installman:
+endif
 
 override_dh_auto_install:
 	dh_auto_install
@@ -24,7 +28,7 @@ override_dh_auto_install:
 	find debian -name '*.json' -exec chmod a-x {} \;
 
 override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ifeq (,$(filter nocheck,$(DEB_BUILD_PROFILES)))
 	dh_auto_install
 	PYBUILD_SYSTEM=custom \
 	PYBUILD_TEST_ARGS="cd {dir}; export PATH={destdir}/usr/bin:$$PATH ; \


=====================================
debian/tests/run-tests
=====================================
@@ -5,5 +5,11 @@ if [ "$ADTTMP" = "" ] ; then
 	ADTTMP=$(mktemp -d /tmp/${pkg}-test.XXXXXX)
 fi
 cd "$ADTTMP"
+
+
+SKIPS=
+if [ "$(id -u)" -eq 0 ]; then
+	SKIPS="-k not TestUdocker"
+fi
 py.test-3 --numprocesses=auto --dist=loadfile --ignore cwltool/schemas \
-	--pyarg cwltool
+	"${SKIPS}" --pyarg cwltool



View it on GitLab: https://salsa.debian.org/med-team/cwltool/compare/8f7d3aeccea377a2e64d66570b8e765b6cfd65b5...24c27c36baf07310bbe5d3dfc35a743ee4e5ad6d

-- 
View it on GitLab: https://salsa.debian.org/med-team/cwltool/compare/8f7d3aeccea377a2e64d66570b8e765b6cfd65b5...24c27c36baf07310bbe5d3dfc35a743ee4e5ad6d
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/20190122/bb23b253/attachment-0001.html>