[med-svn] [Git][med-team/odil][master] add debian patch enable_nose_args.patch

[Drew Parsons]

Drew Parsons pushed to branch master at Debian Med / odil


Commits:
32ecbd31 by Drew Parsons at 2019-11-15T19:53:10Z
add debian patch enable_nose_args.patch

allows arguments to be provided to the nosetests executable.

Used to specify the python version running nose
(specify pythonX.Y as "nose executable", then provide "-m nose" as
noseargs).

Closes: #943473.

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/enable_nose_args.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+odil (0.10.0-9) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * debian patch enable_nose_args.patch allows arguments to be
+    provided to the nosetests executable. Used to specify the python
+    version running nose. Closes: #943473.
+
+ -- Drew Parsons <dparsons at debian.org>  Sat, 16 Nov 2019 03:50:01 +0800
+
 odil (0.10.0-8) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/enable_nose_args.patch
=====================================
@@ -0,0 +1,24 @@
+--- a/tests/run
++++ b/tests/run
+@@ -23,6 +23,8 @@
+     parser.add_argument("--exclude-regex", "-E", help="C++ only")
+     parser.add_argument(
+         "--nose", default="nosetests", help="nosetests executable")
++    parser.add_argument(
++        "--noseargs", default="", help="optional arguments for nosetests executable")
+     parser.add_argument("--exclude", "-e", help="Python only")
+     arguments = parser.parse_args()
+ 
+@@ -76,8 +78,10 @@
+         ctest.append("-V")
+     cpp_code = subprocess.call(ctest+cpp_args, env=environment)
+ 
+-    nose = [
+-        arguments.nose, os.path.join(source_directory, "tests", "wrappers")]
++    nose = [ arguments.nose ]
++    if arguments.noseargs:
++        nose += arguments.noseargs.split()
++    nose.append(os.path.join(source_directory, "tests", "wrappers"))
+     if arguments.verbose:
+         nose.append("-v")
+     python_code = subprocess.call(nose+python_args, env=environment)


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 remove-soname-in-wrappers.patch
+enable_nose_args.patch


=====================================
debian/rules
=====================================
@@ -70,7 +70,7 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	  ln -sr ./wrappers/python/*.py ./build/odil; \
 	  cd build && \
 	    python$${Python} ../tests/run --no-network \
-	      --nose nosetests$$(dpkg --compare-versions $${Python} ge 3 && echo "3") \
+	      --nose python$${Python} --noseargs "-m nose" \
 	      -E ".*"; \
 	  cd ..; \
 	  rm ./build/odil/*py; \



View it on GitLab: https://salsa.debian.org/med-team/odil/commit/32ecbd3108110e1ebd373ceba23930a7c9ac36b4

-- 
View it on GitLab: https://salsa.debian.org/med-team/odil/commit/32ecbd3108110e1ebd373ceba23930a7c9ac36b4
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/20191115/c78a125f/attachment-0001.html>