Skip to content

Commit

Permalink
Merge branch 'master' into minordoc
Browse files Browse the repository at this point in the history
  • Loading branch information
Remi-Gau authored Nov 27, 2023
2 parents e73e0bc + f7d1298 commit c234518
Show file tree
Hide file tree
Showing 92 changed files with 2,088 additions and 1,359 deletions.
60 changes: 58 additions & 2 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,13 @@
"login": "ali_khan",
"name": "Ali Khan"
},
{
"contributions": [
"tool"
],
"login": "alizee_wickenheiser",
"name": "Alizee Wickenheiser"
},
{
"contributions": [
"userTesting"
Expand Down Expand Up @@ -443,6 +450,14 @@
"login": "carlo_miniussi",
"name": "Carlo Miniussi"
},
{
"contributions": [
"data",
"tool"
],
"login": "cecile_madjar",
"name": "Cecile Madjar"
},
{
"contributions": [
"doc"
Expand Down Expand Up @@ -1002,7 +1017,8 @@
"tool",
"eventOrganizing",
"fundingFinding",
"infra"
"infra",
"talk"
],
"login": "francopestilli",
"name": "Franco Pestilli",
Expand Down Expand Up @@ -1461,6 +1477,13 @@
"name": "Jeanette Mumford",
"profile": "https://jeanettemumford.org/"
},
{
"contributions": [
"tool"
],
"login": "jefferson_casimir",
"name": "Jefferson Casimir"
},
{
"contributions": [
"doc"
Expand Down Expand Up @@ -1799,6 +1822,13 @@
"name": "Kurt Schilling",
"profile": "https://github.com/schillkg"
},
{
"contributions": [
"tool"
],
"login": "laetitia_fesselier",
"name": "Laetitia Fesselier"
},
{
"contributions": [
"financial"
Expand Down Expand Up @@ -2728,6 +2758,17 @@
"login": "stephan_bickel",
"name": "Stephan Bickel"
},
{
"contributions": [
"bug",
"code",
"question",
"tool",
"userTesting"
],
"login": "smeisler",
"name": "Steven Meisler"
},
{
"avatar_url": "https://avatars.githubusercontent.com/u/11152799?v=4",
"contributions": [
Expand Down Expand Up @@ -2987,6 +3028,14 @@
"name": "Tristan Glatard",
"profile": "https://github.com/glatard"
},
{
"contributions": [
"data",
"tool"
],
"login": "tyler_collins",
"name": "Tyler Collins"
},
{
"contributions": [
"doc"
Expand Down Expand Up @@ -3091,7 +3140,14 @@
"tool",
"question",
"bug",
"code"
"code",
"data",
"fundingFinding",
"ideas",
"plugin",
"review",
"userTesting",
"infra"
],
"login": "yarikoptic",
"name": "Yaroslav O. Halchenko",
Expand Down
2 changes: 1 addition & 1 deletion .codespellrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[codespell]
skip = *.js,*.svg,*.eps,.git,node_modules,env,venv,.mypy_cache,package-lock.json,CITATION.cff,tools/new_contributors.tsv,./tools/schemacode/docs/build
ignore-words-list = fo,te,als,Acknowledgements,acknowledgements,weill,bu,winn
ignore-words-list = fo,te,als,Acknowledgements,acknowledgements,weill,bu,winn,manuel
builtin = clear,rare,en-GB_to_en-US
# this overloads default dictionaries and I have not yet figured out
# how to have multiple https://github.com/codespell-project/codespell/issues/2727
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/schemacode_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
os: ["ubuntu-latest"]
python-version: ["3.11"]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
Expand Down Expand Up @@ -56,20 +56,21 @@ jobs:
fail-fast: false
matrix:
os: ["ubuntu-latest"]
python-version: ["3.8", "3.9", "3.10", "3.11"]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
include:
- os: macos-latest
python-version: 3
- os: windows-latest
python-version: 3
name: ${{ matrix.os }} with Python ${{ matrix.python-version }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: "Set up Python"
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
allow-prereleases: true

- name: "Display Python version"
run: python -c "import sys; print(sys.version)"
Expand Down Expand Up @@ -129,12 +130,12 @@ jobs:
runs-on: ubuntu-latest
name: Validate schema
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set Up Python environment
uses: actions/setup-python@v4
with:
python-version: "3.9"
python-version: "3.11"

- name: Install the schemacode package
run: |
Expand All @@ -157,7 +158,7 @@ jobs:
needs: [test, validate_schema]
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Download artifacts
uses: actions/download-artifact@v3
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ jobs:
codespell:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: codespell-project/actions-codespell@master

# Markdown formatting
remark:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 14
- name: Install dependencies
Expand All @@ -36,7 +36,7 @@ jobs:
yamllint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: 3
Expand All @@ -49,7 +49,7 @@ jobs:
python-style:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: 3
Expand All @@ -63,7 +63,7 @@ jobs:
latin-phrases:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: 3
Expand All @@ -86,7 +86,7 @@ jobs:
validate_cff:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: 3
Expand Down
8 changes: 0 additions & 8 deletions .lgtm.yml

This file was deleted.

10 changes: 5 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
exclude: 'tools/schemacode/bidsschematools/tests/data/broken_dataset_description.json'
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.5.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
Expand All @@ -13,7 +13,7 @@ repos:
- id: check-added-large-files
- id: check-case-conflict
- repo: https://github.com/psf/black
rev: 23.7.0
rev: 23.11.0
hooks:
- id: black
files: ^tools/(?!schemacode)
Expand All @@ -38,17 +38,17 @@ repos:
- id: flake8
args: [--config=tools/schemacode/setup.cfg]
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v3.0.0
rev: v3.1.0
hooks:
- id: prettier
files: src/schema/.*/.*\.yaml
- repo: https://github.com/codespell-project/codespell
rev: v2.2.5
rev: v2.2.6
hooks:
- id: codespell
args: ["--config=.codespellrc", "--dictionary=-", "--dictionary=.codespell_dict"]
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.4.1
rev: v1.7.0
hooks:
- id: mypy
# Sync with project.optional-dependencies.typing
Expand Down
Loading

0 comments on commit c234518

Please sign in to comment.