[med-svn] [Git][med-team/cwltool][master] 4 commits: Abbreviated option names are no longer allowed in pytest 6

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / cwltool


Commits:
61bf7f44 by Andreas Tille at 2020-12-10T22:08:01+01:00
Abbreviated option names are no longer allowed in pytest 6

- - - - -
3a42d022 by Andreas Tille at 2020-12-10T22:09:11+01:00
Abbreviated option names are no longer allowed in pytest 6 (in Debian packaging)

- - - - -
ca989c27 by Andreas Tille at 2020-12-10T22:18:53+01:00
Standards-Version: 4.5.1

- - - - -
81c96a9a by Andreas Tille at 2020-12-10T22:24:03+01:00
Upload to unstable

- - - - -


6 changed files:

- debian/changelog
- debian/control
- + debian/patches/pytest6.patch
- debian/patches/series
- debian/rules
- debian/tests/run-tests


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+cwltool (3.0.20200807132242-3) unstable; urgency=medium
+
+  * Team upload.
+  * Abbreviated option names are no longer allowed in pytest 6
+    Closes: #977067
+  * Standards-Version: 4.5.1
+
+ -- Andreas Tille <tille at debian.org>  Thu, 10 Dec 2020 22:19:00 +0100
+
 cwltool (3.0.20200807132242-2) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -30,7 +30,7 @@ Build-Depends: debhelper-compat (= 13),
                python3-pydot,
                nodejs,
                help2man
-Standards-Version: 4.5.0
+Standards-Version: 4.5.1
 Vcs-Browser: https://salsa.debian.org/med-team/cwltool
 Vcs-Git: https://salsa.debian.org/med-team/cwltool.git
 Homepage: https://www.commonwl.org


=====================================
debian/patches/pytest6.patch
=====================================
@@ -0,0 +1,38 @@
+Description: Abbreviated option names are no longer allowed in pytest 6
+Bug-Debian: https://bugs.debian.org/977067
+Author: Andreas Tille <tille at debian.org>
+Last-Update Thu, 10 Dec 2020 22:06:24 +0100
+
+--- a/PKG-INFO
++++ b/PKG-INFO
+@@ -609,7 +609,7 @@ Description: ===========================
+         .. code:: bash
+         
+           pip install -rtest-requirements.txt
+-          py.test --ignore cwltool/schemas/ --pyarg cwltool
++          py.test --ignore cwltool/schemas/ --pyargs cwltool
+         
+         To run various tests in all supported Python environments we use `tox <https://github.com/common-workflow-language/cwltool/tree/main/tox.ini>`_. To run the test suite in all supported Python environments
+         first downloading the complete code repository (see the ``git clone`` instructions above) and then run
+--- a/README.rst
++++ b/README.rst
+@@ -600,7 +600,7 @@ To run the basic tests after installing
+ .. code:: bash
+ 
+   pip install -rtest-requirements.txt
+-  py.test --ignore cwltool/schemas/ --pyarg cwltool
++  py.test --ignore cwltool/schemas/ --pyargs cwltool
+ 
+ To run various tests in all supported Python environments we use `tox <https://github.com/common-workflow-language/cwltool/tree/main/tox.ini>`_. To run the test suite in all supported Python environments
+ first downloading the complete code repository (see the ``git clone`` instructions above) and then run
+--- a/cwltool.egg-info/PKG-INFO
++++ b/cwltool.egg-info/PKG-INFO
+@@ -609,7 +609,7 @@ Description: ===========================
+         .. code:: bash
+         
+           pip install -rtest-requirements.txt
+-          py.test --ignore cwltool/schemas/ --pyarg cwltool
++          py.test --ignore cwltool/schemas/ --pyargs cwltool
+         
+         To run various tests in all supported Python environments we use `tox <https://github.com/common-workflow-language/cwltool/tree/main/tox.ini>`_. To run the test suite in all supported Python environments
+         first downloading the complete code repository (see the ``git clone`` instructions above) and then run


=====================================
debian/patches/series
=====================================
@@ -4,3 +4,4 @@ disable_prov
 python3
 pytest
 accept_newer_ruamel
+pytest6.patch


=====================================
debian/rules
=====================================
@@ -35,5 +35,5 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_PROFILES)))
 	PYBUILD_TEST_ARGS="cd {dir}; export PATH={destdir}/usr/bin:$$PATH ; \
 	cd {build_dir}; export PYTHONPATH=$$(pwd); {interpreter} -m pytest \
 		-k 'not test_http_path_mapping and not test_pack and not test_get_subgraph and not TestUdocker and not test_use_metadata and not test_load_graph_fragment_from_packed' \
-		-n auto --dist=loadfile --ignore cwltool/schemas/ -s --pyarg cwltool" dh_auto_test
+		-n auto --dist=loadfile --ignore cwltool/schemas/ -s --pyargs cwltool" dh_auto_test
 endif


=====================================
debian/tests/run-tests
=====================================
@@ -15,4 +15,4 @@ SKIPS=
 # 	SKIPS="-k 'not test_use_metadata'"
 # fi
 py.test-3 --numprocesses=auto --dist=loadfile --ignore=cwltool/schemas -s \
-	-k 'not TestUdocker and not test_use_metadata' --pyarg cwltool
+	-k 'not TestUdocker and not test_use_metadata' --pyargs cwltool



View it on GitLab: https://salsa.debian.org/med-team/cwltool/-/compare/cd82d548c737f3f50aea5561b9ea4e121611a774...81c96a9ae150298738e96f599495f756b655cf5b

-- 
View it on GitLab: https://salsa.debian.org/med-team/cwltool/-/compare/cd82d548c737f3f50aea5561b9ea4e121611a774...81c96a9ae150298738e96f599495f756b655cf5b
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/20201210/3b211586/attachment-0001.html>