Skip to content

Commit

Permalink
Merge branch 'main' into pre-commit-ci-update-config
Browse files Browse the repository at this point in the history
  • Loading branch information
larsoner authored Dec 3, 2024
2 parents d7db96c + 53792b1 commit 2093eee
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ stages:
- bash: |
set -eo pipefail
git clone --depth 1 https://github.com/pyvista/setup-headless-display-action.git
bash setup-headless-display-action/windows/install_opengl.sh
MESA3D_VERSION=24.3.0 bash setup-headless-display-action/windows/install_opengl.sh
displayName: Install OpenGL
- bash: ./tools/azure_dependencies.sh
displayName: Install dependencies with pip
Expand Down
2 changes: 0 additions & 2 deletions doc/sphinxext/mne_doc_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,6 @@ def reset_warnings(gallery_conf, fname):
r"numpy\.core is deprecated and has been renamed to numpy\._core",
# matplotlib
"__array_wrap__ must accept context and return_scalar.*",
# selenium
"setting remote_server_addr",
):
warnings.filterwarnings( # deal with other modules having bad imports
"ignore", message=f".*{key}.*", category=DeprecationWarning
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ doc = [
"pyxdf",
"pyzmq != 24.0.0",
"seaborn != 0.11.2",
"selenium",
"selenium >= 4.27.1",
"sphinx >= 6",
"sphinx-design",
"sphinx-gallery >= 0.16",
Expand Down

0 comments on commit 2093eee

Please sign in to comment.