Merge pull request PyPSA#81 from PyPSA/pandapower-test

Skip pandapower unit test for Python 2.7 if pandapower >= 2.1.0 (closes PyPSA#79)
matzech · Jul 17, 2019 · bea7815 · bea7815
2 parents 7038b76 + e8829f6
commit bea7815
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/test/test_pf_against_pandapower.py b/test/test_pf_against_pandapower.py
@@ -3,15 +3,22 @@
 
 import pypsa
 
-import pandapower as pp
-
 import pandas as pd
 
 import numpy as np
 
+pandapower_compatible = True
+try:
+ import pandapower as pp
+except ImportError:
+ pandapower_compatible = False
 
+import six
 
+import pytest
 
+@pytest.mark.skipif(six.PY2 and not pandapower_compatible,
+ reason="Pandapower 2.0.0 dropped support for Python 2.")
 def test_pandapower_case():
 
  #more complicated examples like