Skip cplex tests in 2.7

biosustain · Aug 4, 2015 · 8bbd7ce · 8bbd7ce
1 parent d09fff0
commit 8bbd7ce
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/tests/test_flux_analysis.py b/tests/test_flux_analysis.py
@@ -19,6 +19,7 @@
 
 import os
 import unittest
+import six
 from sympy import Add
 from cameo.flux_analysis import remove_infeasible_cycles
 
@@ -194,7 +195,7 @@ def setUp(self):
         self.model = CORE_MODEL.copy()
         self.model.solver = 'glpk'
 
-@unittest.skipIf(TRAVIS, 'Skip for now')
+@unittest.skipIf(six.PY2, 'Build stalling in python 2.7.')
 class TestFindBlockedReactionsCPLEX(Wrapper.AbstractTestFindBlockedReactions):
     def setUp(self):
         self.model = CORE_MODEL.copy()
@@ -209,7 +210,7 @@ def setUp(self):
         self.biomass_flux = 0.873921
         self.model.reactions.Biomass_Ecoli_core_N_LPAREN_w_FSLASH_GAM_RPAREN__Nmet2.lower_bound = self.biomass_flux
 
-@unittest.skipIf(TRAVIS, 'Skip for now')
+@unittest.skipIf(six.PY2, 'Build stalling in python 2.7.')
 class TestFluxVariabilityAnalysisCPLEX(Wrapper.AbstractTestFluxVariabilityAnalysis):
     def setUp(self):
         self.model = CORE_MODEL.copy()
@@ -243,7 +244,7 @@ def setUp(self):
         self.model.solver = 'glpk'
 
 
-@unittest.skipIf(TRAVIS, 'Skip for now')
+@unittest.skipIf(six.PY2, 'Build stalling in python 2.7.')
 class TestPhenotypicPhasePlaneCPLEX(Wrapper.AbstractTestPhenotypicPhasePlane):
     def setUp(self):
         self.model = CORE_MODEL.copy()
@@ -256,7 +257,7 @@ def setUp(self):
         self.model.solver = 'glpk'
 
 
-@unittest.skipIf(TRAVIS, 'Skip for now')
+@unittest.skipIf(six.PY2, 'Build stalling in python 2.7.')
 class TestSimulationMethodsCPLEX(Wrapper.AbstractTestSimulationMethods):
     def setUp(self):
         self.model = CORE_MODEL

diff --git a/tests/test_io.py b/tests/test_io.py
@@ -72,7 +72,7 @@ class TestModelLoadingGLPK(AbstractTestModelLoading, unittest.TestCase):
     def setUp(self):
         self.interface = optlang.glpk_interface
 
-
+@unittest.skipIf(six.PY2, 'Build stalling in python 2.7.')
 class TestModelLoadingCPLEX(AbstractTestModelLoading, unittest.TestCase):
     def setUp(self):
         self.interface = optlang.cplex_interface

diff --git a/tests/test_solver_based_model.py b/tests/test_solver_based_model.py
@@ -82,6 +82,7 @@ def setUp(self):
         self.solution = self.model.optimize()
 
 
+@unittest.skipIf(six.PY2, 'Build stalling in python 2.7.')
 class TestLazySolutionCPLEX(AbstractTestLazySolution):
     def setUp(self):
         super(TestLazySolutionCPLEX, self).setUp()
@@ -773,6 +774,7 @@ def test_cobrapy_attributes_not_in_dir(self):
         self.assertNotIn('optimize', dir(self.model))
 
 
+@unittest.skipIf(six.PY2, 'Build stalling in python 2.7.')
 class TestSolverBasedModelCPLEX(WrappedAbstractTestSolverBasedModel.AbstractTestSolverBasedModel):
     def setUp(self):
         super(TestSolverBasedModelCPLEX, self).setUp()