[med-svn] [Git][med-team/python-schema-salad][master] 2 commits: use interpreter shortcut in pytest invocation

[Michael R. Crusoe]

Michael R. Crusoe pushed to branch master at Debian Med / python-schema-salad


Commits:
3012757c by Michael R. Crusoe at 2019-08-24T07:52:47Z
use interpreter shortcut in pytest invocation

- - - - -
4b3ed6d9 by Michael R. Crusoe at 2019-08-26T05:12:42Z
improvement from Steve Langasek <steve.langasek at canonical.com>, thanks!

- - - - -


3 changed files:

- debian/changelog
- debian/patches/lower-case.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+python-schema-salad (4.5.20190815125611-3) unstable; urgency=medium
+
+  * debian/patches/lower-case.patch: improvement from Steve Langasek
+    <steve.langasek at canonical.com>, thanks! (Closes: #935680)
+  * debian/rules: use interpreter shortcut in pytest invocation
+
+ -- Michael R. Crusoe <michael.crusoe at gmail.com>  Mon, 26 Aug 2019 07:07:03 +0200
+
 python-schema-salad (4.5.20190815125611-2) unstable; urgency=medium
 
   * debian/patches/lower-case.patch: better fix


=====================================
debian/patches/lower-case.patch
=====================================
@@ -1,24 +1,28 @@
 commit b88e74f8c4c041f1d4d15c56193b07dcddb95400
 Author: Michael R. Crusoe <michael.crusoe at gmail.com>
+Author: Steve Langasek <steve.langasek at canonical.com>
 Date:   Fri Aug 16 12:25:07 2019 +0200
 
     only be case insensitive when needed
 
-diff --git a/schema_salad/tests/test_ref_resolver.py b/schema_salad/tests/test_ref_resolver.py
-index 04f6605..26f2f8a 100644
---- a/schema_salad/tests/test_ref_resolver.py
-+++ b/schema_salad/tests/test_ref_resolver.py
-@@ -13,6 +13,9 @@ from requests import Session
+Index: python-schema-salad-4.5.20190815125611/schema_salad/tests/test_ref_resolver.py
+===================================================================
+--- python-schema-salad-4.5.20190815125611.orig/schema_salad/tests/test_ref_resolver.py
++++ python-schema-salad-4.5.20190815125611/schema_salad/tests/test_ref_resolver.py
+@@ -13,6 +13,12 @@
  from schema_salad.ref_resolver import DefaultFetcher, Loader, file_uri
  from schema_salad.tests.util import get_data
  
 +def is_fs_case_sensitive(path):  # https://stackoverflow.com/a/36612604/1585509
-+    with tempfile.NamedTemporaryFile(prefix='TmP',dir=path) as tmp_file:
-+        return(not os.path.exists(tmp_file.name.lower()))
++    try:
++        with tempfile.NamedTemporaryFile(prefix='TmP',dir=path) as tmp_file:
++            return(not os.path.exists(tmp_file.name.lower()))
++    except PermissionError:
++        return True
  
  @pytest.fixture
  def tmp_dir_fixture(request):
-@@ -170,24 +173,27 @@ def test_import_list():
+@@ -170,24 +176,27 @@
  
  
  def test_fetch_inject_id():


=====================================
debian/rules
=====================================
@@ -37,7 +37,7 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	dh_auto_install
 	PYBUILD_SYSTEM=custom \
 	PYBUILD_TEST_ARGS="cd {dir}; export PATH={destdir}/usr/bin:$$PATH ; \
-	cd {build_dir}; export PYTHONPATH=$$(pwd); python3 -m pytest \
+	cd {build_dir}; export PYTHONPATH=$$(pwd); {interpreter} -m pytest \
 		-n auto --dist=loadfile --pyarg schema_salad" dh_auto_test
 endif
 



View it on GitLab: https://salsa.debian.org/med-team/python-schema-salad/compare/11efbd68c101bbf754ad59a1de0afd341d65f9b7...4b3ed6d98fdbd72ec769287696b96234320eef3d

-- 
View it on GitLab: https://salsa.debian.org/med-team/python-schema-salad/compare/11efbd68c101bbf754ad59a1de0afd341d65f9b7...4b3ed6d98fdbd72ec769287696b96234320eef3d
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/a1837118/attachment-0001.html>