Merge pull request #824 from effigies/mnt/py310

MNT: Test on Python 3.10, various CI updates

Author: effigies

.github/workflows/package.yml

@@ -21,7 +21,7 @@ jobs:
       matrix:
         include:
           - os: ubuntu-latest
-            python-version: 3.8
+            python-version: "3.10"
     steps:
       - uses: actions/checkout@v2
         with:
@@ -33,16 +33,10 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Display Python version
         run: python -c "import sys; print(sys.version)"
-      - name: Create virtual environment
-        run: tools/ci/create_venv.sh
-      - name: Build sdist
-        run: tools/ci/build_archive.sh
-        env:
-          INSTALL_TYPE: sdist
-      - name: Build wheel
-        run: tools/ci/build_archive.sh
-        env:
-          INSTALL_TYPE: wheel
+      - name: Install build
+        run: python -m pip install build
+      - name: Build sdist and wheel
+        run: python -m build
       - name: Test PyPI upload
         uses: pypa/gh-action-pypi-publish@master
         with:

.github/workflows/pre-release.yml

@@ -24,7 +24,7 @@ jobs:
     strategy:
       matrix:
         os: ['ubuntu-latest', 'macos-latest']
-        python-version: [3.8, 3.9]
+        python-version: [3.8, 3.9, "3.10"]
         install: ['pip']
         check: ['ci_tests']
         pip-flags: ['PRE_PIP_FLAGS']

.github/workflows/stable.yml

@@ -26,7 +26,7 @@ jobs:
     strategy:
       matrix:
         os: ['ubuntu-latest', 'macos-latest']
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.7, 3.8, 3.9, "3.10"]
         install: ['pip']
         check: ['ci_tests']
         pip-flags: ['']

setup.cfg

@@ -20,7 +20,7 @@ classifiers =
     Topic :: Scientific/Engineering
 
 [options]
-python_requires = >=3.6
+python_requires = >=3.7
 install_requires =
     numpy
     scipy

tools/ci/build_archive.sh

@@ -11,21 +11,22 @@ echo "INSTALL_TYPE = $INSTALL_TYPE"
 
 set -x
 
-if [ "$INSTALL_TYPE" == "sdist" ]; then
-    python setup.py egg_info  # check egg_info while we're here
-    python setup.py sdist
-    export ARCHIVE=$( ls dist/*.tar.gz )
-elif [ "$INSTALL_TYPE" == "wheel" ]; then
-    python setup.py bdist_wheel
-    export ARCHIVE=$( ls dist/*.whl )
-elif [ "$INSTALL_TYPE" == "archive" ]; then
-    export ARCHIVE="package.tar.gz"
+if [ "$INSTALL_TYPE" = "sdist" -o "$INSTALL_TYPE" = "wheel" ]; then
+    python -m build
+elif [ "$INSTALL_TYPE" = "archive" ]; then
+    ARCHIVE="/tmp/package.tar.gz"
     git archive -o $ARCHIVE HEAD
-elif [ "$INSTALL_TYPE" == "pip" ]; then
-    export ARCHIVE="."
 fi
 
-if [ "${ARCHIVE:0:5}" = "dist/" ]; then
+if [ "$INSTALL_TYPE" = "sdist" ]; then
+    ARCHIVE=$( ls $PWD/dist/*.tar.gz )
+elif [ "$INSTALL_TYPE" = "wheel" ]; then
+    ARCHIVE=$( ls $PWD/dist/*.whl )
+elif [ "$INSTALL_TYPE" = "pip" ]; then
+    ARCHIVE="$PWD"
+fi
+
+if [ "$INSTALL_TYPE" = "sdist" -o "$INSTALL_TYPE" = "wheel" ]; then
     python -m pip install twine
     python -m twine check $ARCHIVE
 fi

tools/ci/env.sh

@@ -1,4 +1,4 @@
-SETUP_REQUIRES="pip setuptools>=30.3.0,!=61.0.0 wheel"
+SETUP_REQUIRES="pip build"
 
 # Numpy and scipy upload nightly/weekly/intermittent wheels
 NIGHTLY_WHEELS="https://pypi.anaconda.org/scipy-wheels-nightly/simple"

tools/ci/install.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-echo Installing nibabel
+echo Installing pybids
 
 source tools/ci/activate.sh
 source tools/ci/env.sh
@@ -27,12 +27,6 @@ fi
 # Basic import check
 python -c 'import bids; print(bids.__version__)'
 
-if [ "$CHECK_TYPE" == "skiptests" ]; then
-    exit 0
-fi
-
-pip install $EXTRA_PIP_FLAGS "pybids[$CHECK_TYPE]"
-
 set +eux
 
-echo Done installing nibabel
+echo Done installing pybids