diff --git a/.github/workflows/autofix.yml b/.github/workflows/autofix.yml index 6d82b9d71f9..b41e636bf5f 100644 --- a/.github/workflows/autofix.yml +++ b/.github/workflows/autofix.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v5 with: persist-credentials: false - - uses: actions/setup-python@v5 + - uses: actions/setup-python@v6 with: python-version: '3.12' - run: pip install --upgrade towncrier pygithub gitpython numpy diff --git a/.github/workflows/credit.yml b/.github/workflows/credit.yml index 895a0fea588..5e538f6a974 100644 --- a/.github/workflows/credit.yml +++ b/.github/workflows/credit.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v5 with: persist-credentials: true - - uses: actions/setup-python@v5 + - uses: actions/setup-python@v6 with: python-version: '3.12' - run: pip install pygithub -e . diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 892f73bb809..47adf707d36 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v5 with: persist-credentials: false - - uses: actions/setup-python@v5 + - uses: actions/setup-python@v6 with: python-version: '3.10' - name: Install dependencies diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5a3b310b2fd..8f173768b2e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -28,7 +28,7 @@ jobs: - uses: actions/checkout@v5 with: persist-credentials: false - - uses: actions/setup-python@v5 + - uses: actions/setup-python@v6 with: python-version: '3.13' - uses: pre-commit/action@v3.0.1 @@ -118,7 +118,7 @@ jobs: pyvista: false wm: false # Python (if pip) - - uses: actions/setup-python@v5 + - uses: actions/setup-python@v6 with: python-version: ${{ matrix.python }} if: startswith(matrix.kind, 'pip') diff --git a/doc/changes/names.inc b/doc/changes/names.inc index 6d22340c78c..38c240d69d7 100644 --- a/doc/changes/names.inc +++ b/doc/changes/names.inc @@ -112,7 +112,7 @@ .. _Harrison Ritz: https://github.com/harrisonritz .. _Hasrat Ali Arzoo: https://github.com/hasrat17 .. _Henrich Kolkhorst: https://github.com/hekolk -.. _Hongjiang Ye: https://github.com/hongjiang-ye +.. _Hongjiang Ye: https://github.com/ye-hongjiang .. _Hubert Banville: https://github.com/hubertjb .. _Hyonyoung Shin: https://github.com/mcvain .. _Hüseyin Orkun Elmas: https://github.com/HuseyinOrkun diff --git a/doc/conf.py b/doc/conf.py index 2ea68ec8d0a..415f1bf46cc 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -650,10 +650,11 @@ def fix_sklearn_inherited_docstrings(app, what, name, obj, options, lines): "https://doi.org/10.1073/", # pnas.org "https://doi.org/10.1080/", # www.tandfonline.com "https://doi.org/10.1088/", # www.tandfonline.com + "https://doi.org/10.1090/", # ams.org "https://doi.org/10.1093/", # academic.oup.com/sleep/ "https://doi.org/10.1098/", # royalsocietypublishing.org "https://doi.org/10.1101/", # www.biorxiv.org - "https://doi.org/10.1103", # journals.aps.org/rmp + "https://doi.org/10.1103/", # journals.aps.org/rmp "https://doi.org/10.1111/", # onlinelibrary.wiley.com/doi/10.1111/psyp "https://doi.org/10.1126/", # www.science.org "https://doi.org/10.1137/", # epubs.siam.org @@ -663,7 +664,9 @@ def fix_sklearn_inherited_docstrings(app, what, name, obj, options, lines): "https://doi.org/10.1162/", # direct.mit.edu/neco/article/ "https://doi.org/10.1167/", # jov.arvojournals.org "https://doi.org/10.1177/", # journals.sagepub.com + "https://doi.org/10.1523/", # jneurosci.org "https://doi.org/10.3109/", # www.tandfonline.com + "https://doi.org/10.3390/", # mdpi.com "https://hms.harvard.edu/", # doc/funding.rst "https://stackoverflow.com/questions/21752259/python-why-pickle", # doc/help/faq "https://www.biorxiv.org/content/10.1101/", # biorxiv.org @@ -675,6 +678,8 @@ def fix_sklearn_inherited_docstrings(app, what, name, obj, options, lines): "http://prdownloads.sourceforge.net/optipng", "https://sourceforge.net/projects/aespa/files/", "https://sourceforge.net/projects/ezwinports/files/", + r"https://.*\.sourceforge\.net/", + "https://www.cogsci.nl/smathot", "https://www.mathworks.com/products/compiler/matlab-runtime.html", "https://medicine.umich.edu/dept/khri/ross-maddox-phd", # TODO https://github.com/mne-tools/curry-python-reader/issues/5 diff --git a/doc/sphinxext/related_software.py b/doc/sphinxext/related_software.py index 8cbc91be4ff..4d6105a83a9 100644 --- a/doc/sphinxext/related_software.py +++ b/doc/sphinxext/related_software.py @@ -74,6 +74,10 @@ "Summary": "DICOM to NIfTI converter", }, # TODO: these do not set a valid homepage or documentation page on PyPI + "python-picard": { # https://github.com/mind-inria/picard/issues/60 + "Home-page": "https://github.com/mind-inria/picard", + "Summary": "Preconditioned ICA for Real Data", + }, "eeg_positions": { "Home-page": "https://eeg-positions.readthedocs.io", "Summary": "Compute and plot standard EEG electrode positions.", diff --git a/mne/_ola.py b/mne/_ola.py index e43e7cd3d31..939aff39646 100644 --- a/mne/_ola.py +++ b/mne/_ola.py @@ -309,7 +309,7 @@ def __init__( # Create our window boundaries window_name = window if isinstance(window, str) else "custom" self._window = get_window( - window, self._n_samples, fftbins=(self._n_samples - 1) % 2 + window, self._n_samples, fftbins=bool((self._n_samples - 1) % 2) ) self._window /= _check_cola( self._window, self._n_samples, self._step, window_name, tol=tol