[MRG] Complete .zenodo.json for contributor credit

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,19 +1,24 @@
-Thanks for contributing. If this is your first time,
-make sure to read [contributing.md](https://github.com/mne-tools/mne-bids/blob/main/CONTRIBUTING.md)
+<!--
+Thanks for contributing this pull request (PR).
+If this is your first time, make sure to read
+[CONTRIBUTING.md](https://github.com/mne-tools/mne-bids/blob/main/CONTRIBUTING.md)
+-->
 
 PR Description
 --------------
 
-Describe your PR here
+<!--Describe your PR here-->
 
 Merge checklist
 ---------------
 
-Maintainer, please confirm the following before merging:
+Maintainer, please confirm the following before merging.
+If applicable:
 
-- [ ] All comments resolved
+- [ ] All comments are resolved
 - [ ] This is not your own PR
 - [ ] All CIs are happy
 - [ ] PR title starts with [MRG]
 - [ ] [whats_new.rst](https://github.com/mne-tools/mne-bids/blob/main/doc/whats_new.rst) is updated
+- [ ] New contributors have been added to [.zenodo.json](https://github.com/mne-tools/mne-bids/blob/main/.zenodo.json)
 - [ ] PR description includes phrase "closes <#issue-number>"

.github/workflows/unit_tests.yml

@@ -51,7 +51,6 @@ jobs:
         os: [ubuntu-latest]
         python-version: ["3.7", "3.10"]  # Oldest and newest supported versions
     steps:
-    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
       with:
@@ -62,40 +61,43 @@ jobs:
         path: ${{ env.pythonLocation }}
         key: build-0-${{ env.pythonLocation }}-${{ hashFiles('setup.cfg') }}-${{ hashFiles('test_requirements.txt') }}
 
-    - name: Update pip, wheel, and setuptools
-      run: python -m pip install --upgrade pip wheel setuptools
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install wheel setuptools build
 
+    - uses: actions/checkout@v3
     - name: Build sdist
-      run: python setup.py sdist
+      run: python -m build --sdist
     - name: Install sdist
-      run: pip install ./dist/mne-bids-*
+      run: python -m pip install ./dist/mne-bids-*
     - name: Clean up working directory
       run: rm -rf ./*
     - name: Try importing mne_bids
       run: python -c 'import mne_bids; print(mne_bids.__version__)'
     - name: Try cli mne_bids
       run: mne_bids --version
     - name: Remove sdist install
-      run: pip uninstall -y mne-bids
+      run: python -m pip uninstall -y mne-bids
 
     - uses: actions/checkout@v3
     - name: Build wheel
-      run: python setup.py bdist_wheel
+      run: python -m build --wheel
     - name: Install wheel
-      run: pip install ./dist/mne_bids-*.whl
+      run: python -m pip install ./dist/mne_bids-*.whl
     - name: Clean up working directory
       run: rm -rf ./*
     - name: Try importing mne_bids
       run: python -c 'import mne_bids; print(mne_bids.__version__)'
     - name: Try cli mne_bids
       run: mne_bids --version
     - name: Remove wheel install
-      run: pip uninstall -y mne-bids
+      run: python -m pip uninstall -y mne-bids
 
     - uses: actions/checkout@v3
     - name: Test extras install
       run: |
-        pip install .[full]
+        python -m pip install .[full]
         python -c 'import mne_bids; print(mne_bids.__version__)'
         python -c 'import pybv; print(pybv.__version__)'
         python -c 'import nibabel; print(nibabel.__version__)'
@@ -166,20 +168,20 @@ jobs:
 
     - name: Install Python dependencies using pip
       run: |
-        python -m pip install --upgrade pip wheel
-        pip install -r test_requirements.txt
+        python -m pip install --upgrade pip
+        python -m pip install -r test_requirements.txt
 
     - name: Install MNE (stable)
       if: "matrix.mne-version == 'mne-stable'"
       run: |
         git clone --depth 1 https://github.com/mne-tools/mne-python.git -b maint/0.24
-        pip install -e ./mne-python
+        python -m pip install -e ./mne-python
 
     - name: Install MNE (main)
       if: "matrix.mne-version == 'mne-main'"
       run: |
         git clone --depth 1 https://github.com/mne-tools/mne-python.git -b main
-        pip install -e ./mne-python
+        python -m pip install -e ./mne-python
 
     - name: Install BIDS validator (stable)
       if: "matrix.bids-validator-version == 'validator-stable'"
@@ -230,7 +232,7 @@ jobs:
         mne sys_info
 
     - name: Install MNE-BIDS
-      run: pip install -e .
+      run: python -m pip install -e .
 
     - name: Run pytest
       shell: bash

.zenodo.json

@@ -8,63 +8,63 @@
       "orcid": "0000-0001-8002-0877"
     },
     {
-     "affiliation": "Department of Cognitive Sciences, Macquarie University, Sydney, Australia",
+      "affiliation": "Department of Cognitive Sciences, Macquarie University, Sydney, Australia",
       "name": "Sanderson, Matthew",
       "orcid": "0000-0002-4645-8979"
     },
     {
-     "affiliation": "Mozilla",
-      "name":"Brooks, Teon L ",
+      "affiliation": "Mozilla",
+      "name":"Brooks, Teon L.",
       "orcid": "0000-0001-7344-3230"
     },
     {
-     "affiliation": "Department of Neuroscience and Biomedical Engineering, Aalto University, Espoo, Finland",
+      "affiliation": "Department of Neuroscience and Biomedical Engineering, Aalto University, Espoo, Finland",
       "name": "van Vliet, Marijn",
       "orcid": "0000-0002-6537-6899"
     },
     {
-     "affiliation": "Human Cortical Physiology and Neurorehabilitation Section, NINDS, NIH, Bethesda, Maryland 20892",
+      "affiliation": "Human Cortical Physiology and Neurorehabilitation Section, NINDS, NIH, Bethesda, Maryland 20892",
       "name": "Quentin, Romain",
       "orcid": "0000-0001-7659-3605"
     },
     {
-     "affiliation": "UC Berkeley, Project Jupyter",
+      "affiliation": "UC Berkeley, Project Jupyter",
       "name": "Holdgraf, Chris",
       "orcid": "0000-0002-2391-0678"
     },
     {
-     "affiliation": "Institut du cerveau et de la moelle épinière (ICM), Paris, France",
+      "affiliation": "Institut du cerveau et de la moelle épinière (ICM), Paris, France",
       "name": "Chaumon, Maximilien",
       "orcid": "0000-0001-9664-8861"
     },
     {
-     "affiliation": "Department of Biomedical and Clinical Sciences 'L. Sacco', University of Milan, Milan, Italy",
+      "affiliation": "Department of Biomedical and Clinical Sciences 'L. Sacco', University of Milan, Milan, Italy",
       "name": "Mikulan, Ezequiel",
       "orcid": "0000-0001-7259-6120"
     },
     {
-     "affiliation": "Institute for Learning and Brain Sciences, University of Washington, Seattle, WA, USA",
+      "affiliation": "Institute for Learning and Brain Sciences, University of Washington, Seattle, WA, USA",
       "name": "Tavabi, Kambiz",
       "orcid": "0000-0003-1881-892X"
     },
     {
-     "affiliation": "Institute of Neuroscience and Medicine (INM-3), Research Center Jülich, Germany",
-      "name": "Richard Höchenberger",
+      "affiliation": "Institute of Neuroscience and Medicine (INM-3), Research Center Jülich, Germany",
+      "name": "Höchenberger, Richard",
       "orcid": "0000-0002-0380-4798"
     },
     {
-     "affiliation": "Max-Planck-Institute for Empirical Aesthetics, Frankfurt a.M., Germany",
+      "affiliation": "Max-Planck-Institute for Empirical Aesthetics, Frankfurt a.M., Germany",
       "name": "Welke, Dominik",
       "orcid": "0000-0002-5529-1998"
     },
     {
-     "affiliation": "Institute of Psychology, University of Graz, Austria",
+      "affiliation": "Institute of Psychology, University of Graz, Austria",
       "name": "Brunner, Clemens",
       "orcid": "0000-0002-6030-2233"
     },
     {
-     "affiliation": "University of Oregon, Eugene OR, USA",
-      "name": "Rockhill, Alexander P",
+      "affiliation": "University of Oregon, Eugene OR, USA",
+      "name": "Rockhill, Alexander P.",
       "orcid": "0000-0003-3868-7453"
     },
     {
@@ -78,7 +78,107 @@
       "orcid": "0000-0001-8421-365X"
     },
     {
-     "affiliation": "Université Paris-Saclay, Inria, CEA, Palaiseau, France",
+      "affiliation": "Department of Psychology, University of Washington, Seattle WA, USA",
+      "name": "Rokem, Ariel",
+      "orcid": "0000-0003-0679-1985"
+     },
+     {
+      "affiliation": "Institute for Learning & Brain Sciences, University of Washington, Seattle WA, USA",
+      "name": "McCloy, Daniel",
+      "orcid": "0000-0002-7572-3241"
+     },
+     {
+      "affiliation": "Dalhousie University, Halifax, Nova Scotia",
+      "name": "Hurst, Austin J.",
+      "orcid": "0000-0002-0219-4131"
+     },
+     {
+      "affiliation": "Institut d'Investigacions Biomèdiques August Pi i Sunyer (IDIBAPS), Barcelona, Spain",
+      "name": "Lozano-Soldevilla, Diego",
+      "orcid": "0000-0003-1794-8204"
+     },
+     {
+      "affiliation": "Institute of Experimental Psychology, Heinrich Heine University Düsseldorf, Germany",
+      "name": "Ort, Eduard",
+      "orcid": "0000-0001-5546-3561"
+     },
+     {
+      "affiliation": "Medical Research Council Cognition & Brain Sciences Unit, University of Cambridge",
+      "name": "Knights, Ethan",
+      "orcid": "0000-0001-6078-9160"
+     },
+     {
+      "affiliation": "HSE University, Centre for Cognition and Decision Making, Institute for Cognitive Neuroscience, National Research University Higher School of Economics, Russian Federation",
+      "name": "Kalenkovich, Evgenii",
+      "orcid": "0000-0002-4606-4179"
+     },
+     {
+      "name": "von Albedyll, Franziska"
+     },
+     {
+      "name": "Wong, Fu-Te"
+     },
+     {
+      "affiliation": "Facebook AI Research, Paris, France",
+      "name": "King, Jean-Rémi",
+      "orcid": "0000-0002-2121-170X"
+     },
+     {
+      "affiliation": "Psychological & Brain Sciences, Indiana University, Bloomington, IN, USA",
+      "name": "Niso Galán, Julia Guiomar",
+      "orcid": "0000-0001-5872-8924"
+     },
+     {
+      "name": "Koehler, Richard",
+      "orcid": "0000-0002-5219-1289"
+     },
+     {
+      "name": "Luke, Robert",
+      "orcid": "0000-0002-4930-8351"
+     },
+     {
+      "affiliation": "Central Institute of Mental Health, Mannheim, Germany",
+      "name": "Kern, Simon",
+      "orcid": "0000-0002-9050-9040"
+     },
+     {
+      "affiliation": "Korea Advanced Institute of Science and Technology",
+      "name": "Kim, Sin",
+      "orcid": "0000-0003-4652-3758"
+     },
+     {
+      "affiliation": "NeuroSpin, CEA, DRF/Joliot, INSERM, Cognitive Neuroimaging Unit, Université Paris-Saclay, 91191Gif/Yvette, France",
+      "name": "Herbst, Sophie",
+      "orcid": "0000-0001-8502-0366"
+     },
+     {
+      "name": "Gupta, Swastika"
+     },
+     {
+      "affiliation": "Department of Biomedical Engineering, Columbia University",
+      "name": "Donoghue, Thomas",
+      "orcid": "0000-0001-5911-0472"
+     },
+     {
+      "affiliation": "Grupo Neuropsicología y Conducta, Universidad de Antioquia, Medellín, Colombia",
+      "name": "Mantilla Ramos, Yorguin José",
+      "orcid": "0000-0003-4473-0876"
+     },
+     {
+      "affiliation": "McGill University, Montréal, QC, Canada",
+      "name": "Huberty, Scott",
+      "orcid": "0000-0003-2637-031X"
+     },
+     {
+      "affiliation": "Human Neuroscience Platform, Fondation Campus Biotech Geneva, Geneva, Switzerland",
+      "name": "Scheltienne, Mathieu",
+      "orcid": "0000-0001-8316-7436"
+     },
+     {
+      "name": "Saini, Anand"
+     },
+    {
+      "affiliation": "Université Paris-Saclay, Inria, CEA, Palaiseau, France",
       "name": "Gramfort, Alexandre",
       "orcid": "0000-0001-9791-4404"
     },

Makefile

@@ -56,3 +56,8 @@ build-doc:
 	make -C doc/ clean
 	make -C doc/ html
 	cd doc/ && make view
+
+dist-build:
+	@echo "Building dist"
+	rm -rf dist
+	@python -m build

setup.cfg

@@ -6,8 +6,8 @@ maintainer = Mainak Jas
 maintainer_email = [email protected]
 description = MNE-BIDS: Organizing MEG, EEG, and iEEG data according to the BIDS specification and facilitating their analysis with MNE-Python
 keywords = meg, eeg, ieeg, bids, brain imaging data structure, neuroscience, neuroimaging
-long-description = file: README.md
-long-description-content-type = text/markdown; charset=UTF-8
+long_description = file: README.md
+long_description_content_type = text/markdown; charset=UTF-8
 license = BSD-3-Clause
 license_files = LICENSE
 platforms = any
@@ -25,6 +25,7 @@ classifiers =
   Programming Language :: Python :: 3.7
   Programming Language :: Python :: 3.8
   Programming Language :: Python :: 3.9
+  Programming Language :: Python :: 3.10
 project_urls =
   Documentation = https://mne.tools/mne-bids
   Bug Reports = https://github.com/mne-tools/mne-bids/issues

setup.py

@@ -1,4 +1,5 @@
 """Setup MNE-BIDS."""
+import os
 import sys
 
 from setuptools import setup
@@ -9,7 +10,7 @@
 SETUP_REQUIRES += ["wheel"] if "bdist_wheel" in sys.argv else []
 
 version = None
-with open('mne_bids/__init__.py', 'r') as fid:
+with open(os.path.join('mne_bids', '__init__.py'), 'r') as fid:
     for line in fid:
         line = line.strip()
         if line.startswith('__version__ = '):