Merge branch 'master' into fix/participants_not_stored

bids-standard · Nov 12, 2023 · c838065 · c838065
2 parents 4c64e56 + fb83533
commit c838065
Show file tree

Hide file tree

Showing 54 changed files with 6,570 additions and 6,787 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -119,25 +119,24 @@ jobs:
           name: Update Python install tools
           command: |
             python3 -m ensurepip
-            python3 -m pip install --upgrade pip setuptools wheel
+            python3 -m pip install --upgrade pip build
       - run:
           name: Install twine, readme renderer
           command: python3 -m pip install twine readme_renderer[md]
       - run:
           name: Check build and readme rendering
           command: |
-            cd bids-validator && python3 setup.py sdist bdist_wheel
-            twine check dist/*
+            python3 -m build bids-validator/
+            twine check bids-validator/dist/*
       - run:
           name: Check sdist installation
           command: |
             cd bids-validator
-            python3 -m pip install -U virtualenv
-            virtualenv venv
-            source venv/bin/activate
-            python --version
-            pip install -U pip setuptools>=27.0 wheel
-            pip install dist/*.tar.gz
+            python3 -m venv .venv
+            source .venv/bin/activate
+            python3 --version
+            python3 -m pip install --upgrade pip
+            python3 -m pip install dist/*.tar.gz
   pypi_deployment:
     docker:
       - image: alpine:3.13
@@ -154,13 +153,13 @@ jobs:
           name: Update Python install tools
           command: |
             python3 -m ensurepip
-            python3 -m pip install --upgrade pip setuptools wheel
+            python3 -m pip install --upgrade pip build
       - run:
           name: Install twine, readme renderer
           command: python3 -m pip install twine readme_renderer[md]
       - run: git checkout -f $CIRCLE_TAG
-      - run: cd bids-validator && python3 setup.py sdist bdist_wheel
-      - run: cd bids-validator && twine upload dist/*
+      - run: python3 -m build bids-validator/
+      - run: python3 -m twine upload bids-validator/dist/*
   gh-pages_deployment:
     docker:
       - image: node:18-alpine

diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: codespell-project/actions-codespell@master
         with:
           ignore_words_list: ro,anser,te,tage,afterall,nwe,nin,nd,falsy

diff --git a/.github/workflows/deno_tests.yml b/.github/workflows/deno_tests.yml
@@ -16,7 +16,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: denoland/setup-deno@v1
         with:
           deno-version: v1.x
@@ -39,7 +39,7 @@ jobs:
         working-directory: ./bids-validator
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: denoland/[email protected]
         with:
           deno-version: v1.x
@@ -61,7 +61,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name != 'pull_request' && github.repository_owner == 'bids-standard'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
           token: ${{ secrets.PUSH_TOKEN }}

diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml
@@ -11,22 +11,22 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Log in to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: bids/validator
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           push: true
@@ -69,10 +69,10 @@ jobs:
           make -C builddir && \
           sudo make -C builddir install
       - name: Check out code for the container build
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: bids/validator
       - name: Build Container

diff --git a/.github/workflows/node_tests.yml b/.github/workflows/node_tests.yml
@@ -25,8 +25,8 @@ jobs:
         run: |
           git config --global core.autocrlf false
           git config --global core.eol lf
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: '18'
           cache: 'npm'

diff --git a/.github/workflows/python_tests.yml b/.github/workflows/python_tests.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ${{ matrix.platform }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set git name/email
         run: |
           git config --global user.email "[email protected]"
@@ -44,7 +44,7 @@ jobs:
 
       - name: Install git-annex windows
         if: matrix.platform == 'windows-latest'
-        uses: crazy-max/ghaction-chocolatey@v2
+        uses: crazy-max/ghaction-chocolatey@v3
         with:
           args: install git-annex --yes --ignore-checksums
         continue-on-error: true  # This can fail for stupid reasons ¯\_(ツ)_/¯

diff --git a/.github/workflows/test-bids-examples.yml b/.github/workflows/test-bids-examples.yml
@@ -26,10 +26,10 @@ jobs:
 
     steps:
       - name: Set up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 

diff --git a/bids-validator-web/components/App.jsx b/bids-validator-web/components/App.jsx
@@ -1,7 +1,5 @@
 import React from 'react'
-import bowser from 'bowser'
 import Issues from '../components/Issues'
-import BrowserWarning from './BrowserWarning'
 import Validate from '../components/Validate'
 import validate from '../../bids-validator'
 import validatorPackageJson from 'bids-validator/package.json' assert { type: 'json' }
@@ -85,11 +83,6 @@ export default class App extends React.Component {
   }
 
   render() {
-    const browserUnsupported =
-      !bowser.chrome &&
-      !bowser.chromium &&
-      !bowser.firefox &&
-      typeof window !== 'undefined'
     return (
       <div id="root">
         <nav className="navbar navbar-dark bg-dark fixed-top">
@@ -105,18 +98,13 @@ export default class App extends React.Component {
           </div>
         </nav>
         <div className="container page-wrapper">
-          <div className="browser-warning">
-            {browserUnsupported ? <BrowserWarning /> : null}
-          </div>
           <div className="validator">
-            {!browserUnsupported ? (
-              <Validate
-                loading={this.state.status === 'validating'}
-                options={this.state.options}
-                onChange={this.validate}
-                handleOptionToggle={this.handleOptionToggle}
-              />
-            ) : null}
+            <Validate
+              loading={this.state.status === 'validating'}
+              options={this.state.options}
+              onChange={this.validate}
+              handleOptionToggle={this.handleOptionToggle}
+            />
           </div>
           {this.state.status === 'validated' ? (
             <Issues reset={this.reset} {...this.state} />

diff --git a/bids-validator-web/components/BrowserWarning.jsx b/bids-validator-web/components/BrowserWarning.jsx
diff --git a/bids-validator-web/package.json b/bids-validator-web/package.json
@@ -1,27 +1,26 @@
 {
   "name": "bids-validator-web",
-  "version": "1.12.1-dev.0",
+  "version": "1.13.2-dev.0",
   "description": "web client for bids-validator",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.16.7",
-    "bootstrap": "^5.3.1",
-    "bowser": "^2.11.0",
-    "eslint-config-next": "^13.4.12",
-    "next": "^13.4.7",
+    "@babel/runtime": "^7.22.10",
+    "bootstrap": "^5.3.2",
+    "eslint-config-next": "^14.0.0",
+    "next": "^14.0.0",
     "pluralize": "^8.0.0",
     "react": "^18.2.0",
-    "react-bootstrap": "^2.8.0",
+    "react-bootstrap": "^2.9.1",
     "react-dom": "^18.2.0",
-    "sass": "^1.63.6"
+    "sass": "^1.69.4"
   },
   "scripts": {
     "dev": "next",
     "build": "next build",
     "start": "next start"
   },
   "devDependencies": {
-    "@next/eslint-plugin-next": "^13.4.7"
+    "@next/eslint-plugin-next": "^14.0.0"
   }
 }