[med-svn] [python-cobra] 03/04: Refresh patch

[Afif Elghraoui]

This is an automated email from the git hooks/post-receive script.

afif pushed a commit to branch master
in repository python-cobra.

commit d9b07f9262d6d2e01339ba640060b6398237aa8f
Author: Afif Elghraoui <afif at debian.org>
Date:   Wed Jan 25 00:33:28 2017 -0800

    Refresh patch
---
 debian/patches/exclude-pytest-benchmark.patch | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/debian/patches/exclude-pytest-benchmark.patch b/debian/patches/exclude-pytest-benchmark.patch
index da5c12e..49e748f 100644
--- a/debian/patches/exclude-pytest-benchmark.patch
+++ b/debian/patches/exclude-pytest-benchmark.patch
@@ -223,7 +223,7 @@ Forwarded: not-needed
              model, "EX_glc__D_e", "EX_o2_e",
 --- python-cobra.orig/cobra/test/test_io.py
 +++ python-cobra/cobra/test/test_io.py
-@@ -179,14 +179,6 @@
+@@ -188,14 +188,6 @@
          self.extra_comparisons(name, test_model, reread_model)
  
  
@@ -240,9 +240,19 @@ Forwarded: not-needed
      if trial.validation_function is None:
 --- python-cobra.orig/cobra/test/__init__.py
 +++ python-cobra/cobra/test/__init__.py
-@@ -39,4 +39,4 @@
-     """ alias for running all unit-tests on installed cobra
+@@ -2,7 +2,6 @@
+ from cobra.io import read_sbml_model
+ try:
+     import pytest
+-    import pytest_benchmark
+ except ImportError:
+     pytest = None
+ try:
+@@ -44,6 +43,6 @@
      """
-     return pytest.main(
--        ['--pyargs', 'cobra', '--benchmark-skip', '-v', '-rs']) == 0
-+        ['--pyargs', 'cobra', '-v', '-rs']) == 0
+     if pytest:
+         return pytest.main(
+-            ['--pyargs', 'cobra', '--benchmark-skip', '-v', '-rs']) == 0
++            ['--pyargs', 'cobra', '-v', '-rs']) == 0
+     else:
+         raise ImportError('missing package pytest required for testing')

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-cobra.git