Merge pull request #532 from carterbox/update-ci-env

CI: Update conda environments in envs/
tomopy · Mar 22, 2021 · cce6146 · cce6146
2 parents 04c2b33 + 4b9b12e
commit cce6146
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 52 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -65,10 +65,12 @@ jobs:
     vmImage: 'ubuntu-latest'
   strategy:
     matrix:
-      Python36:
-        python.version: '36'
       Python37:
         python.version: '37'
+      Python38:
+        python.version: '38'
+      Python39:
+        python.version: '39'
       Python-nomkl:
         python.version: 'nomkl'
     maxParallel: 4
@@ -95,7 +97,7 @@ jobs:
   strategy:
     matrix:
       Python37:
-        python.version: '37'
+        python.version: '38'
     maxParallel: 4
   steps:
   - bash: echo "##vso[task.prependpath]$CONDA/bin"
@@ -121,10 +123,10 @@ jobs:
     vmImage: 'windows-latest'
   strategy:
     matrix:
-      Python36:
-        python.version: '36'
       Python37:
         python.version: '37'
+      Python39:
+        python.version: '39'
     maxParallel: 4
   steps:
   - powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts"
@@ -140,5 +142,9 @@ jobs:
     displayName: Setup and install
   - script: |
       call activate tomopy
-      nosetests
-    displayName: nosetests
+      coverage run --source tomopy -m pytest test -v
+    displayName: Run tests
+  - script: |
+      call activate tomopy
+      coverage report -m
+    displayName: Report coverage
diff --git a/envs/linux-37.yml b/envs/linux-37.yml
@@ -6,9 +6,9 @@ channels:
 dependencies:
   - coverage!=5.0.2
   - dxchange
-  - gcc_linux-64<=8
+  - gcc_linux-64<=8 # CUDA=10 requires gcc<8
   - git
-  - gxx_linux-64<=8
+  - gxx_linux-64<=8 # CUDA=10 requires gcc<8
   - h5py
   - libstdcxx-ng
   - libgcc-ng
@@ -27,4 +27,4 @@ dependencies:
   - scipy
   - setuptools_scm
   - setuptools_scm_git_archive
-  - timemory
+  - timemory  # not released for python > 3.7
diff --git a/envs/linux-38.yml b/envs/linux-38.yml
@@ -27,4 +27,3 @@ dependencies:
   - scipy
   - setuptools_scm
   - setuptools_scm_git_archive
-  - timemory
diff --git a/envs/linux-36.yml → envs/linux-39.yml b/envs/linux-36.yml → envs/linux-39.yml
@@ -20,12 +20,10 @@ dependencies:
   - numpy ["blas=*=openblas"]
   - opencv>=3.4 ["blas=*=openblas"]
   - pyctest>0.0.10
-  - python=3.6
-  - python-coveralls
+  - python=3.9
   - pywavelets
   - scikit-build
   - scikit-image>=0.17
   - scipy
   - setuptools_scm
   - setuptools_scm_git_archive
-  - timemory
diff --git a/envs/osx-36.yml b/envs/osx-36.yml
diff --git a/envs/osx-37.yml → envs/osx-38.yml b/envs/osx-37.yml → envs/osx-38.yml
@@ -17,11 +17,10 @@ dependencies:
   - numpy
   - opencv
   - pyctest>0.0.10
-  - python=3.7
+  - python=3.8
   - pywavelets
   - scikit-build
   - scikit-image>=0.17
   - scipy
   - setuptools_scm
   - setuptools_scm_git_archive
-  - timemory
diff --git a/envs/win-37.yml b/envs/win-37.yml
@@ -11,11 +11,12 @@ dependencies:
   - mkl
   - mkl-devel
   - mkl_fft
-  - nose
   - numexpr
   - numpy
   - libopencv
+  - py-opencv  # only for testing
   - python=3.7
+  - pytest
   - pywavelets
   - scikit-build
   - scikit-image>=0.17

diff --git a/envs/win-36.yml → envs/win-39.yml b/envs/win-36.yml → envs/win-39.yml
@@ -11,17 +11,16 @@ dependencies:
   - mkl
   - mkl-devel
   - mkl_fft
-  - nose
   - numexpr
   - numpy
   - libopencv
-  - python=3.6
-  - python-coveralls
+  - py-opencv  # only for testing
+  - python=3.9
+  - pytest
   - pywavelets
   - scikit-build
   - scikit-image>=0.17
   - scipy
   - setuptools_scm
   - setuptools_scm_git_archive
-  - timemory
   - vs2017_win-64
diff --git a/envs/win-nomkl.yml b/envs/win-nomkl.yml
@@ -9,7 +9,6 @@ dependencies:
   - git
   - h5py
   - nomkl
-  - nose
   - numexpr
   - numpy
   - libopencv

diff --git a/test/test_tomopy/test_recon/test_algorithm.py b/test/test_tomopy/test_recon/test_algorithm.py
@@ -61,7 +61,7 @@
 __docformat__ = 'restructuredtext en'
 
 try:
-    import mkl
+    import mkl_fft
     found_mkl = True
 except ImportError:
     found_mkl = False

diff --git a/test/test_tomopy/test_recon/test_rotation.py b/test/test_tomopy/test_recon/test_rotation.py
@@ -67,7 +67,7 @@
 __docformat__ = 'restructuredtext en'
 
 try:
-    import mkl
+    import mkl_fft
     found_mkl = True
 except ImportError:
     found_mkl = False