Fix mainline:

Merge of: * #7144 * #7142 * #7140
numba · Jun 24, 2021 · 22d709c · 22d709c
3 parents 87e4ae1 + 424beb5 + bdc87ae
commit 22d709c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -28,10 +28,10 @@ jobs:
     name: Linux
     vmImage: ubuntu-18.04
     matrix:
-      py37_np115_32bit:
+      py37_np117_32bit:
         # 32 bit linux only has np 1.15
         PYTHON: '3.7'
-        NUMPY: '1.15'
+        NUMPY: '1.17'
         CONDA_ENV: azure_ci
         BITS32: yes
         TEST_START_INDEX: 2

diff --git a/buildscripts/incremental/setup_conda_environment.cmd b/buildscripts/incremental/setup_conda_environment.cmd
@@ -22,7 +22,7 @@ call deactivate
 @rem Display root environment (for debugging)
 conda list
 @rem Scipy, CFFI, jinja2 and IPython are optional dependencies, but exercised in the test suite
-conda create -n %CONDA_ENV% -q -y python=%PYTHON% numpy=%NUMPY% cffi pip scipy jinja2 ipython gitpython pyyaml
+conda create -n %CONDA_ENV% -q -y python=%PYTHON% numpy=%NUMPY% cffi pip scipy jinja2 ipython gitpython=3.1.17 pyyaml
 
 call activate %CONDA_ENV%
 @rem Install latest llvmlite build

diff --git a/buildscripts/incremental/setup_conda_environment.sh b/buildscripts/incremental/setup_conda_environment.sh
@@ -41,9 +41,9 @@ conda list
 # NOTE: 32 bit linux... do not install NumPy, there's no conda package for >1.15
 # so it has to come from pip later
 if [[ "$CONDA_SUBDIR" == "linux-32" || "$BITS32" == "yes" ]]; then
-    conda create -n $CONDA_ENV -q -y ${EXTRA_CHANNELS} python=$PYTHON pip gitpython pyyaml
+    conda create -n $CONDA_ENV -q -y ${EXTRA_CHANNELS} python=$PYTHON pip gitpython=3.1.17 pyyaml
 else
-    conda create -n $CONDA_ENV -q -y ${EXTRA_CHANNELS} python=$PYTHON numpy=$NUMPY pip gitpython pyyaml
+    conda create -n $CONDA_ENV -q -y ${EXTRA_CHANNELS} python=$PYTHON numpy=$NUMPY pip gitpython=3.1.17 pyyaml
 fi
 
 # Activate first
@@ -77,8 +77,7 @@ fi
 
 # If on 32bit linux, now pip install NumPy and SciPy (no conda package)
 if [[ "$CONDA_SUBDIR" == "linux-32" || "$BITS32" == "yes" ]] ; then
-    $PIP_INSTALL numpy==$NUMPY
-    $PIP_INSTALL scipy
+    $PIP_INSTALL numpy==$NUMPY scipy
 fi
 
 # Install latest llvmlite build