Merge pull request #1079 from effigies/mnt/nep29

NEP29: Require Python 3.7+, numpy 1.17+, declare 3.10 support

Author: effigies

.github/workflows/pre-release.yml

@@ -26,7 +26,7 @@ jobs:
  strategy:
  matrix:
  os: ['ubuntu-latest', 'windows-latest', 'macos-latest']
- python-version: ["3.8", "3.9", "3.10.0-rc.1"]
+ python-version: ["3.9", "3.10"]
  architecture: ['x64', 'x86']
  install: ['setup']
  check: ['test']
@@ -36,7 +36,7 @@ jobs:
  include:
  # Pydicom master
  - os: ubuntu-latest
- python-version: 3.8
+ python-version: "3.10"
  install: setup
  check: test
  pip-flags: ''
@@ -47,10 +47,6 @@ jobs:
  architecture: x86
  - os: macos-latest
  architecture: x86
- - os: windows-latest
- python-version: "3.10.0-rc.1"
- - os: macos-latest
- python-version: "3.10.0-rc.1"
 
  env:
  DEPENDS: ${{ matrix.depends }}

.github/workflows/stable.yml

@@ -29,7 +29,7 @@ jobs:
  strategy:
  matrix:
  os: ['ubuntu-latest', 'windows-latest', 'macos-latest']
- python-version: [3.6, 3.7, 3.8, 3.9]
+ python-version: [3.7, 3.8, 3.9, "3.10"]
  architecture: ['x64', 'x86']
  install: ['pip']
  check: ['test']
@@ -39,52 +39,52 @@ jobs:
  include:
  # Basic dependencies only
  - os: ubuntu-latest
- python-version: 3.6
+ python-version: 3.7
  install: setup
  check: test
  pip-flags: ''
  depends: REQUIREMENTS
  optional-depends: ''
  # Absolute minimum dependencies
  - os: ubuntu-latest
- python-version: 3.6
+ python-version: 3.7
  install: setup
  check: test
  pip-flags: ''
  depends: MIN_REQUIREMENTS
  optional-depends: ''
  # Absolute minimum dependencies plus old MPL, Pydicom, Pillow
  - os: ubuntu-latest
- python-version: 3.6
+ python-version: 3.7
  install: setup
  check: test
  pip-flags: ''
  depends: MIN_REQUIREMENTS
  optional-depends: MIN_OPT_DEPENDS
  # Clean install imports only with package-declared dependencies
  - os: ubuntu-latest
- python-version: 3.6
+ python-version: 3.7
  install: pip
  check: skiptests
  pip-flags: ''
  depends: ''
  # Check all installation methods
  - os: ubuntu-latest
- python-version: 3.8
+ python-version: "3.10"
  install: wheel
  check: test
  pip-flags: ''
  depends: REQUIREMENTS
  optional-depends: DEFAULT_OPT_DEPENDS
  - os: ubuntu-latest
- python-version: 3.8
+ python-version: "3.10"
  install: sdist
  check: test
  pip-flags: ''
  depends: REQUIREMENTS
  optional-depends: DEFAULT_OPT_DEPENDS
  - os: ubuntu-latest
- python-version: 3.8
+ python-version: "3.10"
  install: archive
  check: test
  pip-flags: ''

.travis.yml

@@ -6,7 +6,7 @@
 
 os: linux
 arch: arm64
-dist: xenial
+dist: focal
 language: python
 cache: pip
 
@@ -21,10 +21,10 @@ env:
  - CHECK_TYPE="test"
 
 python:
- - 3.6
  - 3.7
  - 3.8
  - 3.9
+ - "3.10"
 
 # Set up virtual environment, build package, build from depends
 before_install:

min-requirements.txt

@@ -1,4 +1,4 @@
 # Auto-generated by tools/update_requirements.py
-numpy ==1.15
+numpy ==1.17
 packaging ==17.0
 setuptools

nibabel/_h5py_compat.py

@@ -158,7 +158,7 @@ class Minc2Image(Minc1Image):
  def from_file_map(klass, file_map, *, mmap=True, keep_file_open=None):
  # Import of h5py might take awhile for MPI-enabled builds
  # So we are importing it here "on demand"
- from ._h5py_compat import h5py
+ import h5py
  holder = file_map['image']
  if holder.filename is None:
  raise MincError('MINC2 needs filename for load')

nibabel/minc2.py

@@ -24,13 +24,7 @@
 
 from itertools import zip_longest
 
-try:
- from contextlib import nullcontext
-except ImportError: # PY36
- from contextlib import contextmanager
- @contextmanager
- def nullcontext():
- yield
+from contextlib import nullcontext
 
 
 def test_data(subdir=None, fname=None):

nibabel/testing/__init__.py

@@ -32,7 +32,7 @@
 
 from ..optpkg import optional_package
 _, have_scipy, _ = optional_package('scipy')
-from .._h5py_compat import have_h5py
+_, have_h5py, _ = optional_package('h5py')
 
 from .. import (AnalyzeImage, Spm99AnalyzeImage, Spm2AnalyzeImage,
  Nifti1Pair, Nifti1Image, Nifti2Pair, Nifti2Image,

nibabel/tests/test_h5py_compat.py

@@ -10,15 +10,16 @@
 from nibabel.analyze import AnalyzeImage
 from nibabel.nifti1 import Nifti1Image
 from nibabel.nifti2 import Nifti2Image
-from .._h5py_compat import have_h5py
 
 from nibabel import imageclasses
 from nibabel.imageclasses import spatial_axes_first, class_map, ext_map
 
-
+from nibabel.optpkg import optional_package
 from nibabel.testing import clear_and_catch_warnings
 
 
+have_h5py = optional_package('h5py')[1]
+
 DATA_DIR = pjoin(dirname(__file__), 'data')
 
 MINC_3DS = ('minc1_1_scale.mnc',)