Skip to content

Commit f7df4e5

Browse files
authored
MAINT: Restore VTK nightly wheel on Linux and bump changelog checker (mne-tools#13436)
1 parent 610ebe5 commit f7df4e5

File tree

4 files changed

+11
-19
lines changed

4 files changed

+11
-19
lines changed

.github/workflows/check_changelog.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ jobs:
1313
name: Check towncrier entry in doc/changes/dev/
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: scientific-python/action-towncrier-changelog@v1
16+
- uses: actions/checkout@v5
17+
with:
18+
persist-credentials: false
19+
- uses: scientific-python/action-towncrier-changelog@v2
1720
env:
1821
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1922
BOT_USERNAME: changelog-bot

mne/datasets/tests/test_datasets.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
import pooch
1212
import pytest
13-
from flaky import flaky
1413

1514
import mne.datasets._fsaverage.base
1615
from mne import datasets, read_labels_from_annot, write_labels_to_annot
@@ -174,10 +173,11 @@ def _error_download_2(self, fname, downloader, processor):
174173
datasets._fake.data_path(download=True, force_update=True, **kwargs)
175174

176175

177-
@flaky(max_runs=3)
176+
# Okay to xfail this one because CircleCI downloads + uses the parcellations,
177+
# so we'll know if they break
178+
@pytest.mark.xfail(reason="Figshare blocks access from CIs sometimes")
178179
@pytest.mark.ultraslowtest # not really ultraslow, but flakes out a lot
179180
@testing.requires_testing_data
180-
@requires_good_network
181181
def test_fetch_parcellations(tmp_path):
182182
"""Test fetching parcellations."""
183183
pytest.importorskip("nibabel")

mne/surface.py

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
import json
99
import time
10-
import warnings
1110
from collections import OrderedDict
1211
from copy import deepcopy
1312
from functools import lru_cache, partial
@@ -1472,16 +1471,12 @@ def _decimate_surface_vtk(points, triangles, n_triangles):
14721471
)
14731472
src = vtkPolyData()
14741473
vtkpoints = vtkPoints()
1475-
with warnings.catch_warnings(record=True):
1476-
warnings.simplefilter("ignore")
1477-
vtkpoints.SetData(numpy_to_vtk(points.astype(np.float64)))
1474+
vtkpoints.SetData(numpy_to_vtk(points.astype(np.float64)))
14781475
src.SetPoints(vtkpoints)
14791476
vtkcells = vtkCellArray()
14801477
triangles_ = np.pad(triangles, ((0, 0), (1, 0)), "constant", constant_values=3)
1481-
with warnings.catch_warnings(record=True):
1482-
warnings.simplefilter("ignore")
1483-
idarr = numpy_to_vtkIdTypeArray(triangles_.ravel().astype(np.int64))
1484-
vtkcells.SetCells(triangles.shape[0], idarr)
1478+
idarr = numpy_to_vtkIdTypeArray(triangles_.ravel().astype(np.int64))
1479+
vtkcells.ImportLegacyFormat(idarr)
14851480
src.SetPolys(vtkcells)
14861481
# vtkDecimatePro was not very good, even with SplittingOff and
14871482
# PreserveTopologyOn

tools/install_pre_requirements.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,7 @@ echo "::endgroup::"
3838
# No Numba because it forces an old NumPy version
3939

4040
echo "::group::VTK"
41-
if [[ "$PLATFORM" == "Linux" ]]; then
42-
# Segfault trying to load libx11.so.6
43-
VTK_ARGS=""
44-
else
45-
VTK_ARGS="--extra-index-url \"https://wheels.vtk.org\""
46-
fi
47-
python -m pip install $STD_ARGS --only-binary ":all:" vtk $VTK_ARGS
41+
python -m pip install $STD_ARGS --only-binary ":all:" --extra-index-url "https://wheels.vtk.org" vtk
4842
python -c "import vtk"
4943
echo "::endgroup::"
5044

0 commit comments

Comments
 (0)