Fix AutoPkgTest requirements & s390x build

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@ubuntu.com>, thanks!

    Closes: #935743

 -- Michael R. Crusoe <michael.crusoe@gmail.com>  Mon, 26 Aug 2019 07:16:17 +0200

cwltool (1.0.20190815141648+dfsg-1) unstable; urgency=medium

  * New upstream version

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@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')

python3

pathlib2

pytest

s390x-no-sys-class-power.patch

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