Merge remote-tracking branch 'origin/master'

lmcinnes · Feb 15, 2021 · a20a8cd · a20a8cd
2 parents 34ecc01 + 1a3a301
commit a20a8cd
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -19,7 +19,9 @@ matrix:
       os: linux
     - env: DISTRIB="conda" PYTHON_VERSION="3.7" NUMPY_VERSION="1.17" SCIPY_VERSION="1.3.1"
       os: linux
-    - env: DISTRIB="conda" PYTHON_VERSION="3.8" COVERAGE="true" NUMPY_VERSION="1.17" SCIPY_VERSION="1.3.1"
+    - env: DISTRIB="conda" PYTHON_VERSION="3.8" NUMPY_VERSION="1.20.0" SCIPY_VERSION="1.6.0"
+      os: linux
+    - env: DISTRIB="conda" PYTHON_VERSION="3.8" COVERAGE="true" NUMPY_VERSION="1.20.0" SCIPY_VERSION="1.6.0"
       os: linux
 #    - env: DISTRIB="conda" PYTHON_VERSION="3.7" NUMBA_VERSION="0.51.2"
 #      os: osx

diff --git a/appveyor.yml b/appveyor.yml
@@ -6,6 +6,8 @@ environment:
       MINICONDA: C:\Miniconda36-x64
     - PYTHON_VERSION: "3.7"
       MINICONDA: C:\Miniconda3-x64
+    - PYTHON_VERSION: "3.8"
+      MINICONDA: C:\Miniconda3-x64
 
 init:
   - "ECHO %PYTHON_VERSION% %MINICONDA%"

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -16,6 +16,8 @@ jobs:
           python.version: '3.6'
         Python37:
           python.version: '3.7'
+        Python38:
+          python.version: '3.8'
 
     steps:
       - task: UsePythonVersion@0
@@ -54,6 +56,8 @@ jobs:
           python.version: '3.6'
         Python37:
           python.version: '3.7'
+        Python38:
+          python.version: '3.8'
 
     steps:
       - task: UsePythonVersion@0
@@ -92,6 +96,8 @@ jobs:
           python.version: '3.6'
         Python37:
           python.version: '3.7'
+        Python38:
+          python.version: '3.8'
 
     steps:
       - task: UsePythonVersion@0
@@ -126,8 +132,8 @@ jobs:
       vmImage: 'ubuntu-latest'
     strategy:
       matrix:
-        Python37:
-          python.version: '3.7'
+        Python38:
+          python.version: '3.8'
 
     steps:
       - task: UsePythonVersion@0
@@ -151,7 +157,7 @@ jobs:
 
       - script: |
           export NUMBA_DISABLE_JIT=1
-          pytest umap/tests --junitxml=junit/test-results.xml --cov=umap/ --cov-report=xml --cov-report=html
+          pytest umap/tests --show-capture=no -v --disable-warnings --junitxml=pytest.xml --cov=umap/ --cov-report=xml --cov-report=html
         displayName: 'Run tests'
 
       - script: |
@@ -161,7 +167,7 @@ jobs:
 
       - task: PublishTestResults@2
         inputs:
-          testResultsFiles: 'pytest.xml'
+          testResultsFiles: 'coverage.xml'
           testRunTitle: '$(Agent.OS) - $(Build.BuildNumber)[$(Agent.JobName)] - Python $(python.version)'
         condition: succeededOrFailed()
 

diff --git a/ci_scripts/test.sh b/ci_scripts/test.sh
@@ -6,7 +6,7 @@ set -e
 
 if [[ "$COVERAGE" == "true" ]]; then
     export NUMBA_DISABLE_JIT=1
-    pytest --cov=umap/ --show-capture=no -v --disable-warnings
+    pytest --cov=umap/ --cov-report=xml --cov-report=html --show-capture=no -v --disable-warnings
 else
     pytest --show-capture=no -v --disable-warnings
 fi