Skip to content

Commit 857519b

Browse files
DerAndereJohanneslarsoner
DerAndereJohannes
and
larsoner
committed
FIX: Update osf.io links to new format (#13440)
Co-authored-by: Eric Larson <larson.eric.d@gmail.com>
1 parent 49b09fb commit 857519b

13 files changed

Lines changed: 60 additions & 39 deletions

File tree

‎azure-pipelines.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ stages:
113113
- bash: |
114114
set -e
115115
python -m pip install --progress-bar off --upgrade pip
116-
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
116+
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
117117
python -m pip uninstall -yq mne
118118
python -m pip install --progress-bar off --upgrade -e .[test]
119119
displayName: 'Install dependencies with pip'
@@ -203,7 +203,7 @@ stages:
203203
displayName: 'PyQt6'
204204
- bash: |
205205
set -eo pipefail
206-
python -m pip install "PySide6!=6.8.0,!=6.8.0.1,!=6.9.1"
206+
python -m pip install "PySide6!=6.8.0,!=6.8.0.1,!=6.9.1,!=6.10.0"
207207
mne sys_info -pd
208208
mne sys_info -pd | grep "qtpy .* (PySide6=.*)$"
209209
PYTEST_QT_API=PySide6 pytest -m "not ultraslowtest" ${TEST_OPTIONS}

‎doc/changes/devel/13435.newfeature.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add support for BDF export in :func:`mne.export.export_raw`, by `Clemens Brunner`_

‎doc/changes/devel/13440.bugfix.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix and update osf.io links to new format, by :newcontrib:`Johannes Herforth`.

‎doc/changes/names.inc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@
141141
.. _jeythekey: https://github.com/jeythekey
142142
.. _Joan Massich: https://github.com/massich
143143
.. _Johann Benerradi: https://github.com/HanBnrd
144+
.. _Johannes Herforth: https://herforth.net
144145
.. _Johannes Niediek: https://github.com/jniediek
145146
.. _John Samuelsson: https://github.com/johnsam7
146147
.. _John Veillette: https://psychology.uchicago.edu/directory/john-veillette

‎doc/install/advanced.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ in certain operating systems, for example CentOS. This may lead to incomplete
224224
rendering of some 3D plots. A solution is described in this `Github comment <https://github.com/mne-tools/mne-python/issues/7977#issuecomment-729921035>`_.
225225
It boils down to building a newer version (e.g., 18.3.6)
226226
locally following a variant of `these instructions <https://xorg-team.pages.debian.net/xorg/howto/build-mesa.html#_preparing_mesa_sources>`_.
227-
If you have CentOS 7 or newer, you can also try some `prebuilt binaries <https://osf.io/sp9qg/download>`_ we made.
227+
If you have CentOS 7 or newer, you can also try some `prebuilt binaries <https://osf.io/download/sp9qg>`_ we made.
228228
After downloading the files, untar them and add them to the appropriate library paths
229229
using the following commands:
230230

‎mne/datasets/_fetch.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ def fetch_dataset(
126126
127127
{'dataset_name': 'sample',
128128
'archive_name': 'MNE-sample-data-processed.tar.gz',
129-
'hash': 'md5:12b75d1cb7df9dfb4ad73ed82f61094f',
130-
'url': 'https://osf.io/86qa2/download?version=5',
129+
'hash': 'md5:e8f30c4516abdc12a0c08e6bae57409c',
130+
'url': 'https://osf.io/download/86qa2?version=6',
131131
'folder_name': 'MNE-sample-data',
132132
'config_key': 'MNE_DATASETS_SAMPLE_PATH'}
133133

‎mne/datasets/_fsaverage/base.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,13 @@ def fetch_fsaverage(subjects_dir=None, *, verbose=None):
7373
_manifest_check_download(
7474
manifest_path=FSAVERAGE_MANIFEST_PATH / "root.txt",
7575
destination=subjects_dir,
76-
url="https://osf.io/3bxqt/download?version=2",
76+
url="https://osf.io/download/3bxqt?version=2",
7777
hash_="5133fe92b7b8f03ae19219d5f46e4177",
7878
)
7979
_manifest_check_download(
8080
manifest_path=FSAVERAGE_MANIFEST_PATH / "bem.txt",
8181
destination=subjects_dir / "fsaverage",
82-
url="https://osf.io/7ve8g/download?version=4",
82+
url="https://osf.io/download/7ve8g?version=4",
8383
hash_="b31509cdcf7908af6a83dc5ee8f49fb1",
8484
)
8585
return fs_dir

‎mne/datasets/_phantom/base.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def fetch_phantom(kind, subjects_dir=None, *, verbose=None):
4444
"""
4545
phantoms = dict(
4646
otaniemi=dict(
47-
url="https://osf.io/j5czy/download?version=1",
47+
url="https://osf.io/download/j5czy?version=1",
4848
hash="42d17db5b1db3e30327ffb4cf2649de8",
4949
),
5050
)

‎mne/datasets/config.py‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
# In case we ever have to resort to osf.io again...
124124
# archive_name='mne-testing-data.tar.gz',
125125
# hash='md5:c805a5fed8ca46f723e7eec828d90824',
126-
# url='https://osf.io/dqfgy/download?version=1', # 0.136
126+
# url='https://osf.io/download/dqfgy?version=1', # 0.136
127127
folder_name="MNE-testing-data",
128128
config_key="MNE_DATASETS_TESTING_PATH",
129129
)
@@ -140,23 +140,23 @@
140140
MNE_DATASETS["fnirs_motor"] = dict(
141141
archive_name="MNE-fNIRS-motor-data.tgz",
142142
hash="md5:c4935d19ddab35422a69f3326a01fef8",
143-
url="https://osf.io/dj3eh/download?version=1",
143+
url="https://osf.io/download/dj3eh?version=1",
144144
folder_name="MNE-fNIRS-motor-data",
145145
config_key="MNE_DATASETS_FNIRS_MOTOR_PATH",
146146
)
147147

148148
MNE_DATASETS["ucl_opm_auditory"] = dict(
149149
archive_name="auditory_OPM_stationary.zip",
150150
hash="md5:b2d69aa2d656b960bd0c18968dc1a14d",
151-
url="https://osf.io/download/tp324/?version=1", # original is mwrt3
151+
url="https://osf.io/download/tp324?version=1", # original is mwrt3
152152
folder_name="auditory_OPM_stationary",
153153
config_key="MNE_DATASETS_UCL_OPM_AUDITORY_PATH",
154154
)
155155

156156
MNE_DATASETS["kiloword"] = dict(
157157
archive_name="MNE-kiloword-data.tar.gz",
158158
hash="md5:3a124170795abbd2e48aae8727e719a8",
159-
url="https://osf.io/qkvf9/download?version=1",
159+
url="https://osf.io/download/qkvf9?version=1",
160160
folder_name="MNE-kiloword-data",
161161
config_key="MNE_DATASETS_KILOWORD_PATH",
162162
)
@@ -172,55 +172,55 @@
172172
MNE_DATASETS["opm"] = dict(
173173
archive_name="MNE-OPM-data.tar.gz",
174174
hash="md5:370ad1dcfd5c47e029e692c85358a374",
175-
url="https://osf.io/p6ae7/download?version=2",
175+
url="https://osf.io/download/p6ae7?version=2",
176176
folder_name="MNE-OPM-data",
177177
config_key="MNE_DATASETS_OPM_PATH",
178178
)
179179

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

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

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

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

212212
MNE_DATASETS["somato"] = dict(
213213
archive_name="MNE-somato-data.tar.gz",
214214
hash="md5:32fd2f6c8c7eb0784a1de6435273c48b",
215-
url="https://osf.io/tp4sg/download?version=7",
215+
url="https://osf.io/download/tp4sg?version=7",
216216
folder_name="MNE-somato-data",
217217
config_key="MNE_DATASETS_SOMATO_PATH",
218218
)
219219

220220
MNE_DATASETS["spm"] = dict(
221221
archive_name="MNE-spm-face.tar.gz",
222222
hash="md5:9f43f67150e3b694b523a21eb929ea75",
223-
url="https://osf.io/je4s8/download?version=2",
223+
url="https://osf.io/download/je4s8?version=2",
224224
folder_name="MNE-spm-face",
225225
config_key="MNE_DATASETS_SPM_FACE_PATH",
226226
)
@@ -235,53 +235,53 @@
235235
MNE_DATASETS["visual_92_categories_1"] = dict(
236236
archive_name="MNE-visual_92_categories-data-part1.tar.gz",
237237
hash="md5:74f50bbeb65740903eadc229c9fa759f",
238-
url="https://osf.io/8ejrs/download?version=1",
238+
url="https://osf.io/download/8ejrs?version=1",
239239
folder_name="MNE-visual_92_categories-data",
240240
config_key="MNE_DATASETS_VISUAL_92_CATEGORIES_PATH",
241241
)
242242
MNE_DATASETS["visual_92_categories_2"] = dict(
243243
archive_name="MNE-visual_92_categories-data-part2.tar.gz",
244244
hash="md5:203410a98afc9df9ae8ba9f933370e20",
245-
url="https://osf.io/t4yjp/download?version=1",
245+
url="https://osf.io/download/t4yjp?version=1",
246246
folder_name="MNE-visual_92_categories-data",
247247
config_key="MNE_DATASETS_VISUAL_92_CATEGORIES_PATH",
248248
)
249249

250250
MNE_DATASETS["mtrf"] = dict(
251251
archive_name="mTRF_1.5.zip",
252252
hash="md5:273a390ebbc48da2c3184b01a82e4636",
253-
url="https://osf.io/h85s2/download?version=1",
253+
url="https://osf.io/download/h85s2?version=1",
254254
folder_name="mTRF_1.5",
255255
config_key="MNE_DATASETS_MTRF_PATH",
256256
)
257257
MNE_DATASETS["refmeg_noise"] = dict(
258258
archive_name="sample_reference_MEG_noise-raw.zip",
259259
hash="md5:779fecd890d98b73a4832e717d7c7c45",
260-
url="https://osf.io/drt6v/download?version=1",
260+
url="https://osf.io/download/drt6v?version=1",
261261
folder_name="MNE-refmeg-noise-data",
262262
config_key="MNE_DATASETS_REFMEG_NOISE_PATH",
263263
)
264264

265265
MNE_DATASETS["ssvep"] = dict(
266266
archive_name="ssvep_example_data.zip",
267267
hash="md5:af866bbc0f921114ac9d683494fe87d6",
268-
url="https://osf.io/z8h6k/download?version=5",
268+
url="https://osf.io/download/z8h6k?version=5",
269269
folder_name="ssvep-example-data",
270270
config_key="MNE_DATASETS_SSVEP_PATH",
271271
)
272272

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

281281
MNE_DATASETS["epilepsy_ecog"] = dict(
282282
archive_name="MNE-epilepsy-ecog-data.tar.gz",
283283
hash="md5:ffb139174afa0f71ec98adbbb1729dea",
284-
url="https://osf.io/z4epq/download?version=1",
284+
url="https://osf.io/download/z4epq?version=1",
285285
folder_name="MNE-epilepsy-ecog-data",
286286
config_key="MNE_DATASETS_EPILEPSY_ECOG_PATH",
287287
)
@@ -290,7 +290,7 @@
290290
MNE_DATASETS["fieldtrip_cmc"] = dict(
291291
archive_name="SubjectCMC.zip",
292292
hash="md5:6f9fd6520f9a66e20994423808d2528c",
293-
url="https://osf.io/j9b6s/download?version=1",
293+
url="https://osf.io/download/j9b6s?version=1",
294294
folder_name="MNE-fieldtrip_cmc-data",
295295
config_key="MNE_DATASETS_FIELDTRIP_CMC_PATH",
296296
)
@@ -299,35 +299,35 @@
299299
MNE_DATASETS["bst_auditory"] = dict(
300300
archive_name="bst_auditory.tar.gz",
301301
hash="md5:fa371a889a5688258896bfa29dd1700b",
302-
url="https://osf.io/5t9n8/download?version=1",
302+
url="https://osf.io/download/5t9n8?version=1",
303303
folder_name="MNE-brainstorm-data",
304304
config_key="MNE_DATASETS_BRAINSTORM_PATH",
305305
)
306306
MNE_DATASETS["bst_phantom_ctf"] = dict(
307307
archive_name="bst_phantom_ctf.tar.gz",
308308
hash="md5:80819cb7f5b92d1a5289db3fb6acb33c",
309-
url="https://osf.io/sxr8y/download?version=1",
309+
url="https://osf.io/download/sxr8y?version=1",
310310
folder_name="MNE-brainstorm-data",
311311
config_key="MNE_DATASETS_BRAINSTORM_PATH",
312312
)
313313
MNE_DATASETS["bst_phantom_elekta"] = dict(
314314
archive_name="bst_phantom_elekta.tar.gz",
315315
hash="md5:1badccbe17998d18cc373526e86a7aaf",
316-
url="https://osf.io/dpcku/download?version=1",
316+
url="https://osf.io/download/dpcku?version=1",
317317
folder_name="MNE-brainstorm-data",
318318
config_key="MNE_DATASETS_BRAINSTORM_PATH",
319319
)
320320
MNE_DATASETS["bst_raw"] = dict(
321321
archive_name="bst_raw.tar.gz",
322322
hash="md5:fa2efaaec3f3d462b319bc24898f440c",
323-
url="https://osf.io/9675n/download?version=2",
323+
url="https://osf.io/download/9675n?version=2",
324324
folder_name="MNE-brainstorm-data",
325325
config_key="MNE_DATASETS_BRAINSTORM_PATH",
326326
)
327327
MNE_DATASETS["bst_resting"] = dict(
328328
archive_name="bst_resting.tar.gz",
329329
hash="md5:70fc7bf9c3b97c4f2eab6260ee4a0430",
330-
url="https://osf.io/m7bd3/download?version=3",
330+
url="https://osf.io/download/m7bd3?version=3",
331331
folder_name="MNE-brainstorm-data",
332332
config_key="MNE_DATASETS_BRAINSTORM_PATH",
333333
)
@@ -346,7 +346,7 @@
346346
# Zenodo can be slow, so we use the OSF mirror
347347
# url=('https://zenodo.org/record/3523071/files/'
348348
# 'hf_sef_evoked.tar.gz'),
349-
url="https://osf.io/25f8d/download?version=2",
349+
url="https://osf.io/download/25f8d?version=2",
350350
folder_name="hf_sef",
351351
config_key="MNE_DATASETS_HF_SEF_PATH",
352352
)
@@ -364,7 +364,7 @@
364364
MNE_DATASETS["eyelink"] = dict(
365365
archive_name="MNE-eyelink-data.zip",
366366
hash="md5:68a6323ef17d655f1a659c3290ee1c3f",
367-
url=("https://osf.io/xsu4g/download?version=1"),
367+
url=("https://osf.io/download/xsu4g?version=1"),
368368
folder_name="MNE-eyelink-data",
369369
config_key="MNE_DATASETS_EYELINK_PATH",
370370
)

‎mne/datasets/utils.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ def fetch_aparc_sub_parcellation(subjects_dir=None, verbose=None):
427427

428428
subjects_dir = get_subjects_dir(subjects_dir, raise_error=True)
429429
destination = subjects_dir / "fsaverage" / "label"
430-
urls = dict(lh="https://osf.io/p92yb/download", rh="https://osf.io/4kxny/download")
430+
urls = dict(lh="https://osf.io/download/p92yb", rh="https://osf.io/download/4kxny")
431431
hashes = dict(
432432
lh="9e4d8d6b90242b7e4b0145353436ef77", rh="dd6464db8e7762d969fc1d8087cd211b"
433433
)

0 commit comments

Comments
 (0)