Refactor

.github/release.yml

@@ -1,20 +1,21 @@
+---
 changelog:
   exclude:
     labels:
-      - ignore-for-release
+    - ignore-for-release
   categories:
-    - title: 🛠 Breaking Changes
-      labels:
-        - breaking-change
-    - title: 🎉 Exciting New Features
-      labels:
-        - enhancement
-    - title: 👎 Deprecations
-      labels:
-        - deprecation
-    - title: 🐛 Bug Fixes
-      labels:
-        - bug
-    - title: Other Changes
-      labels:
-        - "*"
+  - title: 🛠 Breaking Changes
+    labels:
+    - breaking-change
+  - title: 🎉 Exciting New Features
+    labels:
+    - enhancement
+  - title: 👎 Deprecations
+    labels:
+    - deprecation
+  - title: 🐛 Bug Fixes
+    labels:
+    - bug
+  - title: Other Changes
+    labels:
+    - '*'

.github/workflows/pypi-publish.yml

@@ -1,3 +1,4 @@
+---
 # This workflow will upload a Python Package using Twine when a release is created
 # For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries
 

.github/workflows/testing.yml

@@ -1,12 +1,13 @@
-name: "Run Tests"
+---
+name: Run Tests
 
 on:
   push:
     branches:
-      - "main"
+    - main
   pull_request:
     branches:
-      - '*'
+    - '*'
 
 concurrency:
   group: environment-${{ github.ref }}
@@ -19,43 +20,43 @@ jobs:
     outputs:
       skip: ${{ steps.result_step.outputs.ci-skip }}
     steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - id: result_step
-        uses: mstachniuk/ci-skip@master
-        with:
-          commit-filter: '[skip ci];[ci skip];[skip github]'
-          commit-filter-separator: ';'
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+    - id: result_step
+      uses: mstachniuk/ci-skip@master
+      with:
+        commit-filter: '[skip ci];[ci skip];[skip github];[no ci]'
+        commit-filter-separator: ;
 
   run_tests:
     needs: check_skip
     if: ${{ needs.check_skip.outputs.skip == 'false' }}
     runs-on: ${{ matrix.os }}
     strategy:
-        fail-fast: false
-        matrix:
-            os: ["ubuntu-latest", "macos-latest"]
-            python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
     name: ${{ matrix.os }} with Python ${{ matrix.python-version }}
     defaults:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@v3
-      - name: 'Set up python'
-        uses: actions/setup-python@v4
-        with:
-            python-version: ${{ matrix.python-version }}
-      - name: 'Display Python version'
-        shell: bash {0}
-        run: python -c "import sys; print(sys.version)"
-      - name: 'Install pybids-reports'
-        shell: bash {0}
-        run: pip install -e .[tests]
-      - name: 'Run tests'
-        shell: bash {0}
-        run: python -m pytest --pyargs bids/ext/reports --cov=bids/ext/reports
-      - name: 'Upload coverage to CodeCov'
-        uses: codecov/codecov-action@v3
-        if: success()
+    - uses: actions/checkout@v3
+    - name: Set up python
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Display Python version
+      shell: bash {0}
+      run: python -c "import sys; print(sys.version)"
+    - name: Install pybids-reports
+      shell: bash {0}
+      run: pip install -e .[tests]
+    - name: Run tests
+      shell: bash {0}
+      run: python -m pytest --pyargs bids/ext/reports --cov=bids/ext/reports
+    - name: Upload coverage to CodeCov
+      uses: codecov/codecov-action@v1
+      if: success()

.pre-commit-config.yaml

@@ -6,6 +6,11 @@ repos:
   hooks:
   - id: trailing-whitespace
   - id: end-of-file-fixer
+  - id: check-yaml
+  - id: check-json
+  - id: check-ast
+  - id: check-added-large-files
+  - id: check-case-conflict
 
 
 - repo: https://github.com/psf/black
@@ -17,8 +22,21 @@ repos:
   rev: 6.0.0
   hooks:
   - id: flake8
+    args: [--config=setup.cfg]
 
 # - repo: https://github.com/pre-commit/mirrors-mypy
 #   rev: v0.991
 #   hooks:
 #   - id: mypy
+
+- repo: https://github.com/pyCQA/isort
+  rev: 5.10.1
+  hooks:
+  - id: isort
+
+
+- repo: https://github.com/jumanjihouse/pre-commit-hook-yamlfmt
+  rev: 0.2.2
+  hooks:
+  - id: yamlfmt
+    args: [--mapping, '2', --sequence, '2', --offset, '0']

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "autoDocstring.docstringFormat": "numpy"
+}

bids/ext/reports/due.py

@@ -46,7 +46,7 @@ def nondecorating_decorator(func):
     activate = add = cite = dump = load = _donothing
 
     def __repr__(self):
-        return self.__class__.__name__ + "()"
+        return f"{self.__class__.__name__}()"
 
 
 def _donothing_func(*args, **kwargs):
@@ -63,7 +63,7 @@ def _donothing_func(*args, **kwargs):
     if type(e).__name__ not in ("ImportError", "ModuleNotFoundError"):
         import logging
 
-        logging.getLogger("duecredit").error("Failed to import duecredit due to %s" % str(e))
+        logging.getLogger("duecredit").error(f"Failed to import duecredit due to {str(e)}")
     # Initiate due stub
     due = InactiveDueCreditCollector()
     BibTeX = Doi = Url = Text = _donothing_func