Attempt to setup cvxopt similar to slycot.

Mark · Mark · commit fdb2d4ad6bf1 · 2022-06-06T14:58:51.000-05:00
diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml
@@ -13,6 +13,7 @@ jobs:
         python-version: [3.7, 3.9]
         slycot: ["", "conda"]
         pandas: [""]
+        cvxopt: ["conda"]
         array-and-matrix: [0]
         include:
           - python-version: 3.9
@@ -46,6 +47,9 @@ jobs:
         if [[ '${{matrix.pandas}}' == 'conda' ]]; then
           conda install -c conda-forge pandas
         fi
+        if [[ '${{matrix.cvxopt}}' == 'conda' ]]; then
+          conda install -c conda-forge cvxopt
+        fi
 
     - name: Test with pytest
       env:
diff --git a/control/exception.py b/control/exception.py
@@ -84,3 +84,15 @@ def pandas_check():
         except:
             pandas_installed = False
     return pandas_installed
+
+# Utility function to see if cvxopt is installed
+cvxopt_installed = None
+def cvxopt_check():
+    global cvxopt_installed
+    if cvxopt_installed is None:
+        try:
+            import cvxopt
+            cvxopt_installed = True
+        except:
+            cvxopt_installed = False
+    return cvxopt_installed
diff --git a/control/tests/conftest.py b/control/tests/conftest.py
@@ -18,6 +18,8 @@
 # pytest.param(marks=)
 slycotonly = pytest.mark.skipif(not control.exception.slycot_check(),
                                 reason="slycot not installed")
+cvxoptonly = pytest.mark.skipif(not control.exception.cvxopt_check(),
+                                reason="cvxopt not installed")
 noscipy0 = pytest.mark.skipif(StrictVersion(sp.__version__) < "1.0",
                               reason="requires SciPy 1.0 or greater")
 nopython2 = pytest.mark.skipif(sys.version_info < (3, 0),
diff --git a/control/tests/passivity_test.py b/control/tests/passivity_test.py
@@ -3,12 +3,12 @@
 Date: May 30, 2022
 '''
 
-import pytest
 import numpy
 from control import ss, passivity
 from sympy import Matrix
+from control.tests.conftest import cvxoptonly
 
-
+@cvxoptonly
 def test_is_passive():
     A = numpy.array([[0, 1], [-2, -2]])
     B = numpy.array([[0], [1]])
diff --git a/setup.py b/setup.py
@@ -43,6 +43,7 @@
                       'matplotlib'],
     extras_require={
        'test': ['pytest', 'pytest-timeout'],
-       'slycot': [ 'slycot>=0.4.0' ]
+       'slycot': [ 'slycot>=0.4.0' ],
+       'cvxopt': [ 'cvxopt>=1.2.0' ]
     }
 )

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@`
`43`	`43`	`'matplotlib'],`
`44`	`44`	`extras_require={`
`45`	`45`	`'test': ['pytest', 'pytest-timeout'],`
`46`		`- 'slycot': [ 'slycot>=0.4.0' ]`
	`46`	`+ 'slycot': [ 'slycot>=0.4.0' ],`
	`47`	`+ 'cvxopt': [ 'cvxopt>=1.2.0' ]`
`47`	`48`	`}`
`48`	`49`	`)`