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
5 changes: 4 additions & 1 deletion .github/workflows/check_changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ jobs:
name: Check towncrier entry in doc/changes/dev/
runs-on: ubuntu-latest
steps:
- uses: scientific-python/action-towncrier-changelog@v1
- uses: actions/checkout@v5
with:
persist-credentials: false
- uses: scientific-python/action-towncrier-changelog@v2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BOT_USERNAME: changelog-bot
6 changes: 3 additions & 3 deletions mne/datasets/tests/test_datasets.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

import pooch
import pytest
from flaky import flaky

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


@flaky(max_runs=3)
# Okay to xfail this one because CircleCI downloads + uses the parcellations,
# so we'll know if they break
@pytest.mark.xfail(reason="Figshare blocks access from CIs sometimes")
@pytest.mark.ultraslowtest # not really ultraslow, but flakes out a lot
@testing.requires_testing_data
@requires_good_network
def test_fetch_parcellations(tmp_path):
"""Test fetching parcellations."""
pytest.importorskip("nibabel")
Expand Down
11 changes: 3 additions & 8 deletions mne/surface.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

import json
import time
import warnings
from collections import OrderedDict
from copy import deepcopy
from functools import lru_cache, partial
Expand Down Expand Up @@ -1472,16 +1471,12 @@ def _decimate_surface_vtk(points, triangles, n_triangles):
)
src = vtkPolyData()
vtkpoints = vtkPoints()
with warnings.catch_warnings(record=True):
warnings.simplefilter("ignore")
vtkpoints.SetData(numpy_to_vtk(points.astype(np.float64)))
vtkpoints.SetData(numpy_to_vtk(points.astype(np.float64)))
src.SetPoints(vtkpoints)
vtkcells = vtkCellArray()
triangles_ = np.pad(triangles, ((0, 0), (1, 0)), "constant", constant_values=3)
with warnings.catch_warnings(record=True):
warnings.simplefilter("ignore")
idarr = numpy_to_vtkIdTypeArray(triangles_.ravel().astype(np.int64))
vtkcells.SetCells(triangles.shape[0], idarr)
idarr = numpy_to_vtkIdTypeArray(triangles_.ravel().astype(np.int64))
vtkcells.ImportLegacyFormat(idarr)
src.SetPolys(vtkcells)
# vtkDecimatePro was not very good, even with SplittingOff and
# PreserveTopologyOn
Expand Down
8 changes: 1 addition & 7 deletions tools/install_pre_requirements.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,7 @@ echo "::endgroup::"
# No Numba because it forces an old NumPy version

echo "::group::VTK"
if [[ "$PLATFORM" == "Linux" ]]; then
# Segfault trying to load libx11.so.6
VTK_ARGS=""
else
VTK_ARGS="--extra-index-url \"https://wheels.vtk.org\""
fi
python -m pip install $STD_ARGS --only-binary ":all:" vtk $VTK_ARGS
python -m pip install $STD_ARGS --only-binary ":all:" --extra-index-url "https://wheels.vtk.org" vtk
python -c "import vtk"
echo "::endgroup::"

Expand Down