tests: update framework

.github/workflows/test.yml

@@ -2,17 +2,11 @@ name: Test
 on: [push, pull_request]
 jobs:
   check:
-    if: github.event_name != 'push' || github.ref != 'refs/heads/devel'
+    if: github.event_name != 'pull_request' || github.repository_owner != 'AMYPAD'
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python: [2.7, 3.6, 3.9]
-    name: Check py${{ matrix.python }}
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python }}
     - name: set PYSHA
       run: echo "PYSHA=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
     - uses: actions/cache@v1
@@ -22,7 +16,7 @@ jobs:
     - name: dependencies
       run: pip install -U pre-commit
     - uses: reviewdog/action-setup@v1
-    - if: github.event_name != 'schedule'
+    - if: github.event_name == 'push' || github.event_name == 'pull_request'
       name: comment
       run: |
         if [[ $EVENT == pull_request ]]; then
@@ -35,15 +29,14 @@ jobs:
       env:
         REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         EVENT: ${{ github.event_name }}
-    - if: startsWith(matrix.python, '3')
-      run: pre-commit run -a --show-diff-on-failure
+    - run: SKIP=mbeautify pre-commit run -a --show-diff-on-failure
   test:
-    if: github.event_name != 'pull_request' || github.head_ref != 'devel'
+    if: github.event_name != 'pull_request' || github.repository_owner != 'AMYPAD'
+    name: py${{ matrix.python }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
         python: [2.7, 3.6, 3.9]
-    name: Test py${{ matrix.python }}
     steps:
     - uses: actions/checkout@v2
       with:
@@ -56,22 +49,25 @@ jobs:
       run: pytest --durations-min=1
     - if: startsWith(matrix.python, '2')
       run: pytest
-    - run: codecov
+    - uses: codecov/codecov-action@v1
   matlab:
-    if: github.event_name != 'pull_request' || github.head_ref != 'devel'
+    if: github.event_name != 'pull_request' || github.repository_owner != 'AMYPAD'
+    name: matlab py${{ matrix.python }}
     runs-on: [self-hosted, python, matlab]
-    name: Test matlab
+    strategy:
+      matrix:
+        python: [3.9]
     steps:
     - uses: actions/checkout@v2
       with:
         fetch-depth: 0
     - name: Run setup-python
-      run: setup-python -p3.7
+      run: setup-python -p${{ matrix.python }}
     - run: pip install -U .[dev]
     - run: pytest --durations-min=1
-    - run: codecov
+    - uses: codecov/codecov-action@v1
     - name: Post Run setup-python
-      run: setup-python -p3.7 -Dr
+      run: setup-python -p${{ matrix.python }} -Dr
       if: ${{ always() }}
   deploy:
     needs: [check, test, matlab]
@@ -85,7 +81,8 @@ jobs:
     - id: dist
       uses: casperdcl/deploy-pypi@v2
       with:
-        pip: true
+        requirements: twine setuptools wheel setuptools_scm[toml]
+        build: true
         gpg_key: ${{ secrets.GPG_KEY }}
         password: ${{ secrets.PYPI_TOKEN }}
         upload: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags') }}

.pre-commit-config.yaml

@@ -2,7 +2,7 @@ default_language_version:
   python: python3
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.0.1
+  rev: v4.1.0
   hooks:
   - id: check-added-large-files
   - id: check-case-conflict
@@ -21,25 +21,27 @@ repos:
   - id: todo
     name: Check TODO
     language: pygrep
+    args: [-i]
     entry: TODO
     types: [text]
     exclude: ^(.pre-commit-config.yaml|.github/workflows/test.yml)$
-    args: [-i]
 - repo: https://gitlab.com/pycqa/flake8
   rev: 3.9.2
   hooks:
   - id: flake8
     args: [-j8]
     additional_dependencies:
+    - flake8-broken-line
     - flake8-bugbear
     - flake8-comprehensions
     - flake8-debugger
+    - flake8-isort
     - flake8-string-format
 - repo: https://github.com/psf/black
   rev: 21.7b0
   hooks:
   - id: black
 - repo: https://github.com/PyCQA/isort
-  rev: 5.9.3
+  rev: 5.10.1
   hooks:
   - id: isort

pyproject.toml

@@ -1,10 +1,6 @@
 [build-system]
 requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=3.4"]
-build-backend = "setuptools.build_meta"
 
 [tool.setuptools_scm]
 write_to = "spm12/_dist_ver.py"
 write_to_template = "__version__ = '{version}'\n"
-
-[tool.black]
-target_version = ["py27", "py36", "py38"]

setup.cfg

@@ -7,8 +7,8 @@ license=Apache 2.0
 license_file=LICENCE.md
 url=https://github.com/AMYPAD/SPM12
 project_urls=
-    Changelog = https://github.com/AMYPAD/SPM12/releases
-    Documentation = https://github.com/AMYPAD/SPM12/#SPM12
+    Changelog=https://github.com/AMYPAD/SPM12/releases
+    Documentation=https://github.com/AMYPAD/SPM12/#SPM12
     Upstream Project=https://www.fil.ion.ucl.ac.uk/spm
 maintainer=Casper da Costa-Luis
 maintainer_email=casper.dcl@physics.org
@@ -36,40 +36,36 @@ classifiers=
     Topic :: Software Development :: Libraries
     Topic :: System :: Installation/Setup
 [options]
-zip_safe = False
+zip_safe=False
 setup_requires=setuptools>=42; wheel; setuptools_scm[toml]>=3.4
 install_requires=
     argopt
     miutil[nii,web]>=0.8.0
-    setuptools  # pkg_resources
     numpy
     scipy
+    setuptools
 include_package_data=True
 packages=find:
 python_requires=>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*
 [options.extras_require]
 dev=
-    pre-commit
-    twine
-    wheel
     pytest
     pytest-cov
     pytest-timeout
     pytest-xdist
-    codecov
 demo=
     miutil[plot]>=0.3.0
     matplotlib
 [options.entry_points]
-console_scripts =
+console_scripts=
     spm12=spm12.cli:main
 [options.packages.find]
 exclude=tests
 [options.package_data]
 *=*.md, *.rst, *.m
 
 [bdist_wheel]
-universal = 1
+universal=1
 
 [flake8]
 max_line_length=88