Remove conda-forge from the dev requirements

travishathaway · Apr 19, 2020 · 603bd61 · 603bd61
1 parent 07a113d
commit 603bd61
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/dev/start b/dev/start
@@ -14,13 +14,13 @@ if ! [ -f "$devenv/conda-meta/history" ]; then
             curl https://repo.anaconda.com/miniconda/Miniconda${pyver}-latest-MacOSX-x86_64.sh -o miniconda${pyver}.sh
         fi
         bash miniconda${pyver}.sh -bfp "$devenv"
-        "${_CONDA}" install -yq -p $devenv python=$pyver --file dev/test-requirements.txt -c defaults -c conda-forge
+        "${_CONDA}" install -yq -p $devenv python=$pyver --file dev/test-requirements.txt -c defaults
     elif [ "$(uname)" = Linux ]; then
         if [ ! -f miniconda${pyver}.sh ]; then
             curl https://repo.anaconda.com/miniconda/Miniconda${pyver}-latest-Linux-x86_64.sh -o miniconda${pyver}.sh
         fi
         bash miniconda${pyver}.sh -bfp "$devenv"
-        "${_CONDA}" install -yq -p $devenv python=$pyver --file dev/test-requirements.txt -c defaults -c conda-forge
+        "${_CONDA}" install -yq -p $devenv python=$pyver --file dev/test-requirements.txt -c defaults
         "${_CONDA}" install -yq -p $devenv patchelf  # for conda-build
     else
         if [ ! -f miniconda${pyver}.exe ]; then

diff --git a/dev/start.bat b/dev/start.bat
@@ -40,8 +40,8 @@ set PYTHONHOME=
 @CALL "%devenv%\Scripts\conda" update -p "%devenv%" -yq --all
 @ECHO               ^>^> conda install -yp "%devenv%" defaults::git
 @CALL "%devenv%\Scripts\conda" install -yp "%devenv%" defaults::git
-@ECHO               ^>^> conda install -yq -p "%devenv%" --file dev/test-requirements.txt -c defaults -c conda-forge
-@CALL "%devenv%\Scripts\conda" install -yq -p "%devenv%" --file dev/test-requirements.txt -c defaults -c conda-forge
+@ECHO               ^>^> conda install -yq -p "%devenv%" --file dev/test-requirements.txt -c defaults
+@CALL "%devenv%\Scripts\conda" install -yq -p "%devenv%" --file dev/test-requirements.txt -c defaults
 
 @CALL "%devenv%\python" -m conda init --dev cmd.exe > NUL
 

diff --git a/dev/test-requirements.txt b/dev/test-requirements.txt
@@ -1,4 +1,4 @@
-# run as 'conda install --file dev/test-requirements.txt -c defaults -c conda-forge'
+# run as 'conda install --file dev/test-requirements.txt -c defaults'
 # conda
 conda-package-handling
 flake8