Merge pull request #736 from murrayrm/ci_conda_fix-28May2022

update python-package-conda workflow to use conda instead of conda-forge
python-control · May 28, 2022 · 2790bc1 · 2790bc1
2 parents 865ba02 + e5a7d82
commit 2790bc1
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml
@@ -38,13 +38,12 @@ jobs:
         pip install coveralls
 
         # Install python-control dependencies
-        # use conda-forge until https://github.com/numpy/numpy/issues/20233 is resolved
-        conda install -c conda-forge numpy matplotlib scipy
+        conda install numpy matplotlib scipy
         if [[ '${{matrix.slycot}}' == 'conda' ]]; then
           conda install -c conda-forge slycot
         fi
         if [[ '${{matrix.pandas}}' == 'conda' ]]; then
-          conda install -c conda-forge pandas
+          conda install pandas
         fi
 
     - name: Test with pytest