From e5a7d820247c8c78d0f95ff1be3fdc3bd763235d Mon Sep 17 00:00:00 2001
From: Richard Murray <murray@cds.caltech.edu>
Date: Sat, 28 May 2022 09:18:22 -0700
Subject: [PATCH] update python-package-conda workflow to use conda instead of
 conda-forge

---
 .github/workflows/python-package-conda.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml
index 3f1910697..0744906a7 100644
--- 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