install pytest-rerunfailures

bnavigator · bnavigator · commit 0fce64b174d5 · 2022-08-20T10:14:47.000+02:00
diff --git a/.github/conda-env/test-env.yml b/.github/conda-env/test-env.yml
@@ -6,6 +6,7 @@ dependencies:
   - pytest
   - pytest-cov
   - pytest-timeout
+  - pytest-rerunfailures
   - numpy
   - matplotlib
   - scipy
diff --git a/.github/workflows/control-slycot-src.yml b/.github/workflows/control-slycot-src.yml
@@ -18,11 +18,8 @@ jobs:
         # Set up (virtual) X11
         sudo apt-get -y install libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0 x11-utils
 
-        # Install test tools
-        pip install pytest pytest-timeout
-
-        # Install python-control dependencies
-        pip install numpy matplotlib scipy
+        # Install python-control with dependencies including test tools
+        pip install -e '.[test]'
 
     - name: Checkout Slycot
       uses: actions/checkout@v3
diff --git a/.github/workflows/install_examples.yml b/.github/workflows/install_examples.yml
@@ -15,12 +15,12 @@ jobs:
         conda config --add channels conda-forge
         conda config --set channel_priority strict
 
-        # Install build and test tools
-        conda install pip pytest
+        # Install build tools
+        conda install pip setuptools setuptools-scm
 
-        # Install python-control dependencies
-        conda install numpy matplotlib scipy jupyter
-        conda install slycot pmw
+        # Install python-control dependencies and extras
+        conda install numpy matplotlib scipy
+        conda install slycot pmw jupyter
 
     - name: Install from source
       run: pip install .
diff --git a/pyproject.toml b/pyproject.toml
@@ -40,7 +40,7 @@ dynamic = ["version"]
 packages = ["control"]
 
 [project.optional-dependencies]
-test = ["pytest", "pytest-timeout"]
+test = ["pytest", "pytest-timeout", "pytest-rerunfailures"]
 slycot = [ "slycot>=0.4.0" ]
 cvxopt = [ "cvxopt>=1.2.0" ]
 
@@ -52,7 +52,7 @@ source = "https://github.com/python-control/python-control"
 write_to = "control/_version.py"
 
 [tool.pytest.ini_options]
-addopts = "-ra"
+addopts = "-rav"
 filterwarnings = [
     "error:.*matrix subclass:PendingDeprecationWarning",
 ]
