Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
repos:
# Ruff mne
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.13.3
rev: v0.14.0
hooks:
- id: ruff-check
name: ruff lint mne
Expand Down
4 changes: 2 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ stages:
- bash: |
set -e
python -m pip install --progress-bar off --upgrade pip
python -m pip install --progress-bar off "mne-qt-browser[opengl] @ git+https://github.com/mne-tools/mne-qt-browser.git" pyvista scikit-learn python-picard qtpy nibabel sphinx-gallery "PySide6!=6.8.0,!=6.8.0.1,!=6.8.1.1,!=6.9.1" pandas neo pymatreader antio defusedxml
python -m pip install --progress-bar off "mne-qt-browser[opengl] @ git+https://github.com/mne-tools/mne-qt-browser.git" pyvista scikit-learn python-picard qtpy nibabel sphinx-gallery "PySide6!=6.8.0,!=6.8.0.1,!=6.8.1.1,!=6.9.1,!=6.10.0" pandas neo pymatreader antio defusedxml
python -m pip uninstall -yq mne
python -m pip install --progress-bar off --upgrade -e .[test]
displayName: 'Install dependencies with pip'
Expand Down Expand Up @@ -203,7 +203,7 @@ stages:
displayName: 'PyQt6'
- bash: |
set -eo pipefail
python -m pip install "PySide6!=6.8.0,!=6.8.0.1,!=6.9.1"
python -m pip install "PySide6!=6.8.0,!=6.8.0.1,!=6.9.1,!=6.10.0"
mne sys_info -pd
mne sys_info -pd | grep "qtpy .* (PySide6=.*)$"
PYTEST_QT_API=PySide6 pytest -m "not ultraslowtest" ${TEST_OPTIONS}
Expand Down
1 change: 1 addition & 0 deletions doc/changes/dev/13440.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix and update osf.io links to new format, by :newcontrib:`Johannes Herforth`.
1 change: 1 addition & 0 deletions doc/changes/names.inc
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@
.. _jeythekey: https://github.com/jeythekey
.. _Joan Massich: https://github.com/massich
.. _Johann Benerradi: https://github.com/HanBnrd
.. _Johannes Herforth: https://herforth.net
.. _Johannes Niediek: https://github.com/jniediek
.. _John Samuelsson: https://github.com/johnsam7
.. _John Veillette: https://psychology.uchicago.edu/directory/john-veillette
Expand Down
2 changes: 1 addition & 1 deletion doc/install/advanced.rst
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ in certain operating systems, for example CentOS. This may lead to incomplete
rendering of some 3D plots. A solution is described in this `Github comment <https://github.com/mne-tools/mne-python/issues/7977#issuecomment-729921035>`_.
It boils down to building a newer version (e.g., 18.3.6)
locally following a variant of `these instructions <https://xorg-team.pages.debian.net/xorg/howto/build-mesa.html#_preparing_mesa_sources>`_.
If you have CentOS 7 or newer, you can also try some `prebuilt binaries <https://osf.io/sp9qg/download>`_ we made.
If you have CentOS 7 or newer, you can also try some `prebuilt binaries <https://osf.io/download/sp9qg>`_ we made.
After downloading the files, untar them and add them to the appropriate library paths
using the following commands:

Expand Down
4 changes: 2 additions & 2 deletions mne/datasets/_fetch.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ def fetch_dataset(

{'dataset_name': 'sample',
'archive_name': 'MNE-sample-data-processed.tar.gz',
'hash': 'md5:12b75d1cb7df9dfb4ad73ed82f61094f',
'url': 'https://osf.io/86qa2/download?version=5',
'hash': 'md5:e8f30c4516abdc12a0c08e6bae57409c',
'url': 'https://osf.io/download/86qa2?version=6',
'folder_name': 'MNE-sample-data',
'config_key': 'MNE_DATASETS_SAMPLE_PATH'}

Expand Down
4 changes: 2 additions & 2 deletions mne/datasets/_fsaverage/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,13 @@ def fetch_fsaverage(subjects_dir=None, *, verbose=None):
_manifest_check_download(
manifest_path=FSAVERAGE_MANIFEST_PATH / "root.txt",
destination=subjects_dir,
url="https://osf.io/3bxqt/download?version=2",
url="https://osf.io/download/3bxqt?version=2",
hash_="5133fe92b7b8f03ae19219d5f46e4177",
)
_manifest_check_download(
manifest_path=FSAVERAGE_MANIFEST_PATH / "bem.txt",
destination=subjects_dir / "fsaverage",
url="https://osf.io/7ve8g/download?version=4",
url="https://osf.io/download/7ve8g?version=4",
hash_="b31509cdcf7908af6a83dc5ee8f49fb1",
)
return fs_dir
Expand Down
2 changes: 1 addition & 1 deletion mne/datasets/_phantom/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def fetch_phantom(kind, subjects_dir=None, *, verbose=None):
"""
phantoms = dict(
otaniemi=dict(
url="https://osf.io/j5czy/download?version=1",
url="https://osf.io/download/j5czy?version=1",
hash="42d17db5b1db3e30327ffb4cf2649de8",
),
)
Expand Down
52 changes: 26 additions & 26 deletions mne/datasets/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
# In case we ever have to resort to osf.io again...
# archive_name='mne-testing-data.tar.gz',
# hash='md5:c805a5fed8ca46f723e7eec828d90824',
# url='https://osf.io/dqfgy/download?version=1', # 0.136
# url='https://osf.io/download/dqfgy?version=1', # 0.136
folder_name="MNE-testing-data",
config_key="MNE_DATASETS_TESTING_PATH",
)
Expand All @@ -140,23 +140,23 @@
MNE_DATASETS["fnirs_motor"] = dict(
archive_name="MNE-fNIRS-motor-data.tgz",
hash="md5:c4935d19ddab35422a69f3326a01fef8",
url="https://osf.io/dj3eh/download?version=1",
url="https://osf.io/download/dj3eh?version=1",
folder_name="MNE-fNIRS-motor-data",
config_key="MNE_DATASETS_FNIRS_MOTOR_PATH",
)

MNE_DATASETS["ucl_opm_auditory"] = dict(
archive_name="auditory_OPM_stationary.zip",
hash="md5:b2d69aa2d656b960bd0c18968dc1a14d",
url="https://osf.io/download/tp324/?version=1", # original is mwrt3
url="https://osf.io/download/tp324?version=1", # original is mwrt3
folder_name="auditory_OPM_stationary",
config_key="MNE_DATASETS_UCL_OPM_AUDITORY_PATH",
)

MNE_DATASETS["kiloword"] = dict(
archive_name="MNE-kiloword-data.tar.gz",
hash="md5:3a124170795abbd2e48aae8727e719a8",
url="https://osf.io/qkvf9/download?version=1",
url="https://osf.io/download/qkvf9?version=1",
folder_name="MNE-kiloword-data",
config_key="MNE_DATASETS_KILOWORD_PATH",
)
Expand All @@ -172,55 +172,55 @@
MNE_DATASETS["opm"] = dict(
archive_name="MNE-OPM-data.tar.gz",
hash="md5:370ad1dcfd5c47e029e692c85358a374",
url="https://osf.io/p6ae7/download?version=2",
url="https://osf.io/download/p6ae7?version=2",
folder_name="MNE-OPM-data",
config_key="MNE_DATASETS_OPM_PATH",
)

MNE_DATASETS["phantom_kit"] = dict(
archive_name="MNE-phantom-KIT-data.tar.gz",
hash="md5:7bfdf40bbeaf17a66c99c695640e0740",
url="https://osf.io/fb6ya/download?version=1",
url="https://osf.io/download/fb6ya?version=1",
folder_name="MNE-phantom-KIT-data",
config_key="MNE_DATASETS_PHANTOM_KIT_PATH",
)

MNE_DATASETS["phantom_4dbti"] = dict(
archive_name="MNE-phantom-4DBTi.zip",
hash="md5:938a601440f3ffa780d20a17bae039ff",
url="https://osf.io/v2brw/download?version=2",
url="https://osf.io/download/v2brw?version=2",
folder_name="MNE-phantom-4DBTi",
config_key="MNE_DATASETS_PHANTOM_4DBTI_PATH",
)

MNE_DATASETS["phantom_kernel"] = dict(
archive_name="MNE-phantom-kernel.tar.gz",
hash="md5:4e2ad987dac1a20f95bae8ffeb2d41d6",
url="https://osf.io/dj7wz/download?version=1",
url="https://osf.io/download/dj7wz?version=1",
folder_name="MNE-phantom-kernel-data",
config_key="MNE_DATASETS_PHANTOM_KERNEL_PATH",
)

MNE_DATASETS["sample"] = dict(
archive_name="MNE-sample-data-processed.tar.gz",
hash="md5:e8f30c4516abdc12a0c08e6bae57409c",
url="https://osf.io/86qa2/download?version=6",
url="https://osf.io/download/86qa2?version=6",
folder_name="MNE-sample-data",
config_key="MNE_DATASETS_SAMPLE_PATH",
)

MNE_DATASETS["somato"] = dict(
archive_name="MNE-somato-data.tar.gz",
hash="md5:32fd2f6c8c7eb0784a1de6435273c48b",
url="https://osf.io/tp4sg/download?version=7",
url="https://osf.io/download/tp4sg?version=7",
folder_name="MNE-somato-data",
config_key="MNE_DATASETS_SOMATO_PATH",
)

MNE_DATASETS["spm"] = dict(
archive_name="MNE-spm-face.tar.gz",
hash="md5:9f43f67150e3b694b523a21eb929ea75",
url="https://osf.io/je4s8/download?version=2",
url="https://osf.io/download/je4s8?version=2",
folder_name="MNE-spm-face",
config_key="MNE_DATASETS_SPM_FACE_PATH",
)
Expand All @@ -235,53 +235,53 @@
MNE_DATASETS["visual_92_categories_1"] = dict(
archive_name="MNE-visual_92_categories-data-part1.tar.gz",
hash="md5:74f50bbeb65740903eadc229c9fa759f",
url="https://osf.io/8ejrs/download?version=1",
url="https://osf.io/download/8ejrs?version=1",
folder_name="MNE-visual_92_categories-data",
config_key="MNE_DATASETS_VISUAL_92_CATEGORIES_PATH",
)
MNE_DATASETS["visual_92_categories_2"] = dict(
archive_name="MNE-visual_92_categories-data-part2.tar.gz",
hash="md5:203410a98afc9df9ae8ba9f933370e20",
url="https://osf.io/t4yjp/download?version=1",
url="https://osf.io/download/t4yjp?version=1",
folder_name="MNE-visual_92_categories-data",
config_key="MNE_DATASETS_VISUAL_92_CATEGORIES_PATH",
)

MNE_DATASETS["mtrf"] = dict(
archive_name="mTRF_1.5.zip",
hash="md5:273a390ebbc48da2c3184b01a82e4636",
url="https://osf.io/h85s2/download?version=1",
url="https://osf.io/download/h85s2?version=1",
folder_name="mTRF_1.5",
config_key="MNE_DATASETS_MTRF_PATH",
)
MNE_DATASETS["refmeg_noise"] = dict(
archive_name="sample_reference_MEG_noise-raw.zip",
hash="md5:779fecd890d98b73a4832e717d7c7c45",
url="https://osf.io/drt6v/download?version=1",
url="https://osf.io/download/drt6v?version=1",
folder_name="MNE-refmeg-noise-data",
config_key="MNE_DATASETS_REFMEG_NOISE_PATH",
)

MNE_DATASETS["ssvep"] = dict(
archive_name="ssvep_example_data.zip",
hash="md5:af866bbc0f921114ac9d683494fe87d6",
url="https://osf.io/z8h6k/download?version=5",
url="https://osf.io/download/z8h6k?version=5",
folder_name="ssvep-example-data",
config_key="MNE_DATASETS_SSVEP_PATH",
)

MNE_DATASETS["erp_core"] = dict(
archive_name="MNE-ERP-CORE-data.tar.gz",
hash="md5:5866c0d6213bd7ac97f254c776f6c4b1",
url="https://osf.io/rzgba/download?version=1",
url="https://osf.io/download/rzgba?version=1",
folder_name="MNE-ERP-CORE-data",
config_key="MNE_DATASETS_ERP_CORE_PATH",
)

MNE_DATASETS["epilepsy_ecog"] = dict(
archive_name="MNE-epilepsy-ecog-data.tar.gz",
hash="md5:ffb139174afa0f71ec98adbbb1729dea",
url="https://osf.io/z4epq/download?version=1",
url="https://osf.io/download/z4epq?version=1",
folder_name="MNE-epilepsy-ecog-data",
config_key="MNE_DATASETS_EPILEPSY_ECOG_PATH",
)
Expand All @@ -290,7 +290,7 @@
MNE_DATASETS["fieldtrip_cmc"] = dict(
archive_name="SubjectCMC.zip",
hash="md5:6f9fd6520f9a66e20994423808d2528c",
url="https://osf.io/j9b6s/download?version=1",
url="https://osf.io/download/j9b6s?version=1",
folder_name="MNE-fieldtrip_cmc-data",
config_key="MNE_DATASETS_FIELDTRIP_CMC_PATH",
)
Expand All @@ -299,35 +299,35 @@
MNE_DATASETS["bst_auditory"] = dict(
archive_name="bst_auditory.tar.gz",
hash="md5:fa371a889a5688258896bfa29dd1700b",
url="https://osf.io/5t9n8/download?version=1",
url="https://osf.io/download/5t9n8?version=1",
folder_name="MNE-brainstorm-data",
config_key="MNE_DATASETS_BRAINSTORM_PATH",
)
MNE_DATASETS["bst_phantom_ctf"] = dict(
archive_name="bst_phantom_ctf.tar.gz",
hash="md5:80819cb7f5b92d1a5289db3fb6acb33c",
url="https://osf.io/sxr8y/download?version=1",
url="https://osf.io/download/sxr8y?version=1",
folder_name="MNE-brainstorm-data",
config_key="MNE_DATASETS_BRAINSTORM_PATH",
)
MNE_DATASETS["bst_phantom_elekta"] = dict(
archive_name="bst_phantom_elekta.tar.gz",
hash="md5:1badccbe17998d18cc373526e86a7aaf",
url="https://osf.io/dpcku/download?version=1",
url="https://osf.io/download/dpcku?version=1",
folder_name="MNE-brainstorm-data",
config_key="MNE_DATASETS_BRAINSTORM_PATH",
)
MNE_DATASETS["bst_raw"] = dict(
archive_name="bst_raw.tar.gz",
hash="md5:fa2efaaec3f3d462b319bc24898f440c",
url="https://osf.io/9675n/download?version=2",
url="https://osf.io/download/9675n?version=2",
folder_name="MNE-brainstorm-data",
config_key="MNE_DATASETS_BRAINSTORM_PATH",
)
MNE_DATASETS["bst_resting"] = dict(
archive_name="bst_resting.tar.gz",
hash="md5:70fc7bf9c3b97c4f2eab6260ee4a0430",
url="https://osf.io/m7bd3/download?version=3",
url="https://osf.io/download/m7bd3?version=3",
folder_name="MNE-brainstorm-data",
config_key="MNE_DATASETS_BRAINSTORM_PATH",
)
Expand All @@ -346,7 +346,7 @@
# Zenodo can be slow, so we use the OSF mirror
# url=('https://zenodo.org/record/3523071/files/'
# 'hf_sef_evoked.tar.gz'),
url="https://osf.io/25f8d/download?version=2",
url="https://osf.io/download/25f8d?version=2",
folder_name="hf_sef",
config_key="MNE_DATASETS_HF_SEF_PATH",
)
Expand All @@ -364,7 +364,7 @@
MNE_DATASETS["eyelink"] = dict(
archive_name="MNE-eyelink-data.zip",
hash="md5:68a6323ef17d655f1a659c3290ee1c3f",
url=("https://osf.io/xsu4g/download?version=1"),
url=("https://osf.io/download/xsu4g?version=1"),
folder_name="MNE-eyelink-data",
config_key="MNE_DATASETS_EYELINK_PATH",
)
2 changes: 1 addition & 1 deletion mne/datasets/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ def fetch_aparc_sub_parcellation(subjects_dir=None, verbose=None):

subjects_dir = get_subjects_dir(subjects_dir, raise_error=True)
destination = subjects_dir / "fsaverage" / "label"
urls = dict(lh="https://osf.io/p92yb/download", rh="https://osf.io/4kxny/download")
urls = dict(lh="https://osf.io/download/p92yb", rh="https://osf.io/download/4kxny")
hashes = dict(
lh="9e4d8d6b90242b7e4b0145353436ef77", rh="dd6464db8e7762d969fc1d8087cd211b"
)
Expand Down
4 changes: 2 additions & 2 deletions tools/get_minimal_commands.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ fi;
if [[ "${CI_OS_NAME}" != "macos"* ]]; then
echo "Getting files for Linux..."
if [ ! -d "${PWD}/minimal_cmds" ]; then
curl -L https://osf.io/g7dzs/download?version=5 | tar xz
curl -L https://osf.io/download/g7dzs?version=5 | tar xz
else
echo "Minimal commands already downloaded"
fi;
Expand All @@ -50,7 +50,7 @@ if [[ "${CI_OS_NAME}" != "macos"* ]]; then
else
echo "Getting files for macOS Intel..."
if [ ! -d "${PWD}/minimal_cmds" ]; then
curl -L https://osf.io/rjcz4/download?version=2 | tar xz
curl -L https://osf.io/download/rjcz4?version=2 | tar xz
else
echo "Minimal commands already downloaded"
fi;
Expand Down
1 change: 1 addition & 0 deletions tools/github_actions_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ if [ ! -z "$CONDA_ENV" ]; then
fi
elif [[ "${MNE_CI_KIND}" == "pip" ]]; then
INSTALL_KIND="full-pyside6,$INSTALL_KIND"
STD_ARGS="$STD_ARGS --pre PySide6!=6.10.0"
else
test "${MNE_CI_KIND}" == "pip-pre"
STD_ARGS="$STD_ARGS --pre"
Expand Down
3 changes: 2 additions & 1 deletion tools/install_pre_requirements.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,13 @@ echo "::endgroup::"

echo "::group::Everything else"
python -m pip install $STD_ARGS \
"git+https://github.com/pyvista/pyvista" \
"git+https://github.com/pyvista/pyvista" \
"git+https://github.com/pyvista/pyvistaqt" \
"git+https://github.com/nilearn/nilearn" \
"git+https://github.com/pierreablin/picard" \
https://gitlab.com/obob/pymatreader/-/archive/master/pymatreader-master.zip \
git+https://github.com/mne-tools/mne-qt-browser \
git+https://github.com/pyqtgraph/pyqtgraph \
git+https://github.com/mne-tools/mne-bids \
git+https://github.com/nipy/nibabel \
git+https://github.com/joblib/joblib \
Expand Down
Loading