ci

osqp · Aug 7, 2020 · 46dff11 · 46dff11
1 parent 129a2c1
commit 46dff11
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -49,6 +49,8 @@ install:
   - bash miniconda.sh -b -p $HOME/miniconda
   - source $HOME/miniconda/bin/activate
   - conda config --set always_yes yes --set changeps1 no --set auto_update_conda no
+  - conda config --add channels conda-forge
+  - conda config --set channel_priority strict
   - conda create -n testenv python=$PYTHON_VERSION pytest numpy
   - source activate testenv
   - conda install conda conda-verify conda-build anaconda-client twine

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,6 +1,5 @@
 platform:
   - x64
-  - x86
 
 image: Visual Studio 2015
 
@@ -35,7 +34,8 @@ install:
   - if "%PLATFORM%"=="x64" set MINICONDA=C:\Miniconda3-x64
   # Load the conda root environment, configure and install some packages
   - '"%MINICONDA%\Scripts\activate.bat"'
-  - conda config --append channels conda-forge
+  - conda config --add channels conda-forge
+  - conda config --set channel_priority strict
   - conda config --set always_yes yes --set changeps1 no --set auto_update_conda no
   - conda create -n testenv python=%PYTHON_VERSION% pytest numpy cmake conda conda-verify conda-build anaconda-client twine
   - activate testenv

diff --git a/conda-recipe/conda_build_config.yaml b/conda-recipe/conda_build_config.yaml
@@ -1,5 +1,5 @@
-numpy:
-  - 1.11
+# numpy:
+#   - 1.11
 
 CONDA_BUILD_SYSROOT:
   - /var/tmp/MacOSX-SDKs/MacOSX10.9.sdk   # [osx]