add conftest.py fixture and travis job to check with ndarray

bnavigator · bnavigator · commit eda91ca9b203 · 2020-07-24T00:53:04.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -49,6 +49,11 @@ jobs:
       services: xvfb
       python: "3.8"
       env: SCIPY=scipy SLYCOT=source
+    - name: "use numpy matrix"
+      dist: xenial
+      services: xvfb
+      python: "3.8"
+      env: SCIPY=scipy SLYCOT=source PYTHON_CONTROL_STATESPACE_ARRAY=1
 
   # Exclude combinations that are very unlikely (and don't work)
   exclude:
diff --git a/control/tests/conftest.py b/control/tests/conftest.py
@@ -0,0 +1,13 @@
+# contest.py - pytest local plugins and fixtures
+
+import control
+import os
+
+import pytest
+
+
+@pytest.fixture(scope="session", autouse=True)
+def use_numpy_ndarray():
+    """Switch the config to use ndarray instead of matrix"""
+    if os.getenv("PYTHON_CONTROL_STATESPACE_ARRAY") == "1":
+        control.config.defaults['statesp.use_numpy_matrix'] = False
