[med-svn] [python-cobra] 03/07: Remove backported 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 c018d66077d990360b6cc0a59754699ce83387ae
Author: Afif Elghraoui <afif at ghraoui.name>
Date:   Tue Mar 8 19:34:54 2016 -0800

    Remove backported patch
---
 debian/patches/fix-test-skips.patch | 40 -------------------------------------
 debian/patches/series               |  1 -
 2 files changed, 41 deletions(-)

diff --git a/debian/patches/fix-test-skips.patch b/debian/patches/fix-test-skips.patch
deleted file mode 100644
index 4141095..0000000
--- a/debian/patches/fix-test-skips.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 2ddffbe26b0f9b4050c4eedf989f99f07fe9def4 Mon Sep 17 00:00:00 2001
-From: Ali Ebrahim <aebrahim at ucsd.edu>
-Date: Tue, 16 Feb 2016 15:13:45 -0800
-Subject: [PATCH] fix minor bug when skipping tests
-
----
- cobra/test/flux_analysis.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/cobra/test/flux_analysis.py b/cobra/test/flux_analysis.py
-index 4103cf0..0ba8cf1 100644
---- a/cobra/test/flux_analysis.py
-+++ b/cobra/test/flux_analysis.py
-@@ -173,7 +173,7 @@ def test_loopless(self):
-         try:
-             solver = get_solver_name(mip=True)
-         except:
--            self.skip("no MILP solver found")
-+            self.skipTest("no MILP solver found")
-         test_model = Model()
-         test_model.add_metabolites(Metabolite("A"))
-         test_model.add_metabolites(Metabolite("B"))
-@@ -203,7 +203,7 @@ def test_gapfilling(self):
-         try:
-             solver = get_solver_name(mip=True)
-         except:
--            self.skip("no MILP solver found")
-+            self.skipTest("no MILP solver found")
-         m = Model()
-         m.add_metabolites(map(Metabolite, ["a", "b", "c"]))
-         r = Reaction("EX_A")
-@@ -247,7 +247,7 @@ def test_phenotype_phase_plane(self):
-         self.assertAlmostEqual(data.growth_rates.max(), 1.20898, places=4)
-         self.assertAlmostEqual(abs(data.growth_rates[0, :]).max(), 0, places=4)
-         if matplotlib is None:
--            self.skip("can't test plots without matplotlib")
-+            self.skipTest("can't test plots without matplotlib")
-         data.plot()
- 
- # make a test suite to run all of the tests
diff --git a/debian/patches/series b/debian/patches/series
index 6b820bd..d86c913 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 mathjax.patch
-fix-test-skips.patch

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