MNT: Separate out pytest and nose jobs

Author: effigies

.azure-pipelines/windows.yml

@@ -29,17 +29,21 @@ jobs:
       displayName: 'Update build tools'
     - script: |
         python -m pip install --find-links %EXTRA_WHEELS% %DEPENDS%
-        python -m pip install nose mock coverage codecov pytest
+        python -m pip install nose coverage codecov pytest
       displayName: 'Install dependencies'
     - script: |
-        python -m pip install .
+        python -m pip install '.[$(CHECK_TYPE)]'
         SET NIBABEL_DATA_DIR=%CD%\\nibabel-data
       displayName: 'Install nibabel'
     - script: |
         mkdir for_testing
         cd for_testing
         cp ../.coveragerc .
-        nosetests --with-doctest --with-coverage --cover-package nibabel nibabel
+        if %CHECK_TYPE%=="nosetests" (
+            nosetests --with-doctest --with-coverage --cover-package nibabel nibabel
+        ) else (
+            pytest --doctest-modules --cov nibabel -v --pyargs nibabel --deselect streamlines
+        )
       displayName: 'Nose tests'
     - script: |
         cd for_testing

.travis.yml

@@ -28,6 +28,10 @@ python:
 
 matrix:
   include:
+    # Old nosetests - Remove soon
+    - python: 3.7
+      env:
+        - CHECK_TYPE="nosetests"
     # Basic dependencies only
     - python: 3.5
       env:
@@ -124,13 +128,18 @@ script:
           cd doc
           make html;
           make doctest;
-      elif [ "${CHECK_TYPE}" == "test" ]; then
+      elif [ "${CHECK_TYPE}" == "nosetests" ]; then
           # Change into an innocuous directory and find tests from installation
           mkdir for_testing
           cd for_testing
           cp ../.coveragerc .
           nosetests --with-doctest --with-coverage --cover-package nibabel nibabel
-          pytest -v ../nibabel/tests
+      elif [ "${CHECK_TYPE}" == "test" ]; then
+          # Change into an innocuous directory and find tests from installation
+          mkdir for_testing
+          cd for_testing
+          cp ../.coveragerc .
+          pytest --doctest-modules --cov nibabel -v --pyargs nibabel --deselect streamlines
       else
           false
       fi

setup.cfg

@@ -32,10 +32,6 @@ python_requires = >=3.5.1
 install_requires =
     numpy >=1.12
     packaging
-tests_require =
-    nose >=0.11
-    pytest
-test_suite = nose.collector
 zip_safe = False
 packages = find:
 
@@ -54,10 +50,15 @@ minc2 =
     h5py
 style =
     flake8
+nosetests =
+    coverage
+    nose >=0.11
+    pytest
 test =
     coverage
     nose >=0.11
     pytest
+    pytest-cov
 all =
     %(dicom)s
     %(dev)s