[med-svn] [Git][med-team/cwltool][master] Fix AutoPkgTest requirements & s390x build

[Michael R. Crusoe]

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


Commits:
920ab061 by Michael R. Crusoe at 2019-08-26T05:24:28Z
Fix AutoPkgTest requirements & s390x build

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/s390x-no-sys-class-power.patch
- debian/patches/series
- debian/tests/control


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+cwltool (1.0.20190815141648+dfsg-2) unstable; urgency=medium
+
+  * Fix AutoPkgTest requirements (Closes: #935579)
+  * debian/patches/s390x-no-sys-class-power.patch: Fix s390x build,
+    courtesy Steve Langasek <steve.langasek at ubuntu.com>, thanks!
+    Closes: #935743
+
+ -- Michael R. Crusoe <michael.crusoe at gmail.com>  Mon, 26 Aug 2019 07:16:17 +0200
+
 cwltool (1.0.20190815141648+dfsg-1) unstable; urgency=medium
 
   * New upstream version


=====================================
debian/patches/s390x-no-sys-class-power.patch
=====================================
@@ -0,0 +1,25 @@
+Description: handle psutils.tests not being importable on s390x
+ The psutils.tests module fails to import if /sys/class/power_supply does
+ not exist, which it won't on s390x (at least with certain Linux kernel
+ configurations).  If we're on a s390x kernel and this import fails, it's
+ a reasonably safe assumption that we're not running under travis.
+Author: Steve Langasek <steve.langasek at ubuntu.com>
+Last-Modified: 2019-08-25
+
+Index: cwltool-1.0.20190815141648+dfsg/tests/test_udocker.py
+===================================================================
+--- cwltool-1.0.20190815141648+dfsg.orig/tests/test_udocker.py
++++ cwltool-1.0.20190815141648+dfsg/tests/test_udocker.py
+@@ -5,7 +5,11 @@
+ from .util import get_data, get_main_output
+ import tempfile
+ import shutil
+-from psutil.tests import TRAVIS
++try:
++    # fails on s390x
++    from psutil.tests import TRAVIS
++except:
++    TRAVIS = False
+ 
+ LINUX = sys.platform in ('linux', 'linux2')
+ 


=====================================
debian/patches/series
=====================================
@@ -6,3 +6,4 @@ exclude_jshint
 python3
 pathlib2
 pytest
+s390x-no-sys-class-power.patch


=====================================
debian/tests/control
=====================================
@@ -1,3 +1,3 @@
 Tests: run-tests
-Depends: @, python3-pytest-xdist, python3-pytest-mock, python3-pytest-runner, nodejs, curl, python2
+Depends: @, python3-pytest-xdist, python3-pytest-mock, python3-pytest-runner, nodejs, curl, python3-mock
 Restrictions: allow-stderr



View it on GitLab: https://salsa.debian.org/med-team/cwltool/commit/920ab061279e860285ee4d97cb3c13de1c399340

-- 
View it on GitLab: https://salsa.debian.org/med-team/cwltool/commit/920ab061279e860285ee4d97cb3c13de1c399340
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/20190826/967c6904/attachment-0001.html>