Skip to content
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
2f0b69b
MAINT: Try updating to vtk 9.3
larsoner Jun 19, 2024
d0477b6
[autofix.ci] apply automated fixes
autofix-ci[bot] Jun 19, 2024
9b12916
Merge remote-tracking branch 'upstream/main' into bump
larsoner Jun 25, 2024
1ceeff8
[autofix.ci] apply automated fixes
autofix-ci[bot] Jun 25, 2024
88f78c3
Merge remote-tracking branch 'upstream/main' into bump
larsoner Jun 25, 2024
e8830c8
Merge remote-tracking branch 'upstream/main' into bump
larsoner Jun 29, 2024
e9f95fa
FIX: Versions
larsoner Jun 29, 2024
1a790db
FIX: Reqs
larsoner Jun 29, 2024
49ffe96
FIX: Another
larsoner Jun 29, 2024
d216d79
FIX: Refactor
larsoner Jun 29, 2024
be7aaaf
FIX: Generic
larsoner Jun 29, 2024
17c8bef
FIX: Simplify
larsoner Jun 29, 2024
c04ac56
FIX: Name
larsoner Jun 29, 2024
161ac9e
WIP: Still need to get rid of PyQt5
larsoner Jun 29, 2024
7a9edad
WIP
larsoner Jul 6, 2024
a187742
Merge remote-tracking branch 'upstream/main' into bump
larsoner Jul 6, 2024
1152191
FIX: Try
larsoner Jul 6, 2024
015732a
FIX: Ver
larsoner Jul 6, 2024
39df5ad
FIX: Mpl
larsoner Jul 6, 2024
33a0bbf
FIX: More
larsoner Jul 6, 2024
48253f4
FIX: Ubuntu
larsoner Jul 6, 2024
a6a720d
FIX: Test
larsoner Jul 6, 2024
d197a91
FIX: Ver
larsoner Jul 6, 2024
a0a7823
ENH: mnelab
larsoner Jul 6, 2024
97b0f24
FIX: Another
larsoner Jul 6, 2024
e540ed9
FIX: State
larsoner Jul 6, 2024
3f57e72
FIX: Todo
larsoner Jul 6, 2024
aaaa8fe
FIX: Comment
larsoner Jul 6, 2024
f3a5fac
FIX: Try no spyder
larsoner Jul 6, 2024
ed5ac82
FIX: Missing
larsoner Jul 6, 2024
f384936
FIX: Try another
larsoner Jul 9, 2024
8ba7f6d
FIX: Try again
larsoner Jul 9, 2024
9271123
FIX: RC and not migrated
larsoner Jul 9, 2024
baf9bde
FIX: Good enough
larsoner Jul 9, 2024
3a2994e
FIX: Not RC
larsoner Jul 9, 2024
c33ff99
FIX: Maybe?
larsoner Jul 9, 2024
15fcc47
FIX: Fixes
larsoner Jul 9, 2024
f675e5b
TST: Ping
larsoner Jul 9, 2024
9f6e1d1
FIX: sip is from pyqt
larsoner Jul 9, 2024
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
10 changes: 10 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
groups:
actions:
patterns:
- "*"
6 changes: 6 additions & 0 deletions .github/release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
changelog:
exclude:
authors:
- dependabot
- pre-commit-ci
- github-actions
50 changes: 9 additions & 41 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [macos-11, macos-14] # Intel and Apple Silicon, respectively
os: [macos-12, macos-14] # Intel and Apple Silicon, respectively
runs-on: ${{ matrix.os }}
env:
GITHUB_EVENT_NAME: ${{ github.event_name }}
Expand All @@ -34,10 +34,6 @@ jobs:
- uses: actions/checkout@v3
- uses: mamba-org/setup-micromamba@v1
with:
condarc: |
channels:
- conda-forge
channel_priority: strict
Comment thread
larsoner marked this conversation as resolved.
environment-file: environment.yml
- run: ./tools/extract_version.sh
- run: ./tools/macos_install_certificates.sh
Expand Down Expand Up @@ -72,7 +68,7 @@ jobs:
path: MNE-Python-*.*

build_linux:
name: Build (Linux)
name: Build (${{ matrix.os }})
runs-on: ubuntu-20.04
defaults:
run:
Expand All @@ -81,10 +77,6 @@ jobs:
- uses: actions/checkout@v3
- uses: mamba-org/setup-micromamba@v1
with:
condarc: |
channels:
- conda-forge
channel_priority: strict
environment-file: environment.yml
- run: ./tools/extract_version.sh
- run: ./tools/run_constructor.sh
Expand All @@ -96,7 +88,7 @@ jobs:
path: MNE-Python-*.*

build_windows:
name: Build (Windows)
name: Build (${{ matrix.os }})
strategy:
fail-fast: false
runs-on: windows-2019
Expand All @@ -107,10 +99,6 @@ jobs:
- uses: actions/checkout@v3
- uses: mamba-org/setup-micromamba@v1
with:
condarc: |
channels:
- conda-forge
channel_priority: strict
environment-file: environment.yml
- run: ./tools/extract_version.sh
- run: ./tools/run_constructor.sh
Expand All @@ -128,7 +116,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [macos-11, macos-12, macos-13, macos-14] # macos-14 is Apple Silicon; older versions are Intel
os: [macos-12, macos-13, macos-14] # macos-14 is Apple Silicon; older versions are Intel
runs-on: ${{ matrix.os }}
defaults:
run:
Expand Down Expand Up @@ -166,7 +154,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04, ubuntu-22.04]
os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04]
runs-on: ${{ matrix.os }}
defaults:
run:
Expand Down Expand Up @@ -225,37 +213,16 @@ jobs:
release:
name: Release
needs: [build_macos, build_linux, build_windows, test_macos, test_linux, test_windows]
if: github.ref_type == 'tag'
runs-on: ubuntu-latest
defaults:
run:
shell: bash -el {0}
steps:
# These names should correspond to MNE_INSTALLER_ARTIFACT_ID in tools/extract_version.sh
- uses: actions/download-artifact@v3
with:
name: MNE-Python-Linux-x86_64
- uses: actions/download-artifact@v3
with:
name: MNE-Python-Linux-x86_64-json
- uses: actions/download-artifact@v3
with:
name: MNE-Python-Windows-x86_64
- uses: actions/download-artifact@v3
with:
name: MNE-Python-Windows-x86_64-json
- uses: actions/download-artifact@v3
with:
name: MNE-Python-macOS-x86_64
- uses: actions/download-artifact@v3
with:
name: MNE-Python-macOS-x86_64-json
- uses: actions/download-artifact@v3
with:
name: MNE-Python-macOS-arm64
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: MNE-Python-macOS-arm64-json
name: MNE-Python-*
merge-multiple: true
- run: ls -al ./
- uses: ncipollo/release-action@v1
with:
Expand All @@ -265,3 +232,4 @@ jobs:
prerelease: true
allowUpdates: true
generateReleaseNotes: true
if: github.ref_type == 'tag'
23 changes: 11 additions & 12 deletions recipes/mne-python/construct.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ channels:

specs:
# Python
- python =3.12.2
- python =3.12.4
- pip =24.0
- conda =24.5.0
- mamba =1.5.8
Expand Down Expand Up @@ -95,17 +95,17 @@ specs:
- python-neo =0.13.1
- pandas =2.2.2
# BLAS
- scipy =1.13.1
- scipy =1.14.0
- openblas =0.3.27
- libblas =3.9.0=*openblas
- jupyter =1.0.0
- jupyterlab =4.2.2
- jupyterlab =4.2.3
- ipykernel =6.29.4
- spyder-kernels =2.5.2
- spyder =5.5.5
- darkdetect =0.8.0
- qdarkstyle =3.2.3
- numba =0.59.1
- numba =0.60.0
- cython =3.0.10
# I/O
- pyxdf =1.16.6
Expand All @@ -115,7 +115,7 @@ specs:
# Statistics
- pingouin =0.5.4
# MRI
- fsleyes =1.12.3
- fsleyes =1.12.4
- dcm2niix =1.0.20240202
- dipy =1.9.0
# Time-frequency analysis
Expand All @@ -132,7 +132,6 @@ specs:
- openneuro-py =2024.2.0
# sleep staging
- sleepecg =0.5.8
- yasa =0.6.4
# various biological signals (ECG, EOG, EMG, …)
- neurokit2 =0.2.9
# GitHub client, https://cli.github.com
Expand All @@ -145,7 +144,7 @@ specs:
- ipympl =0.9.4
- seaborn =0.13.2
- plotly =5.22.0
- vtk =9.2.6
- vtk =9.3.0
- git =2.45.2 # [win]
- make =4.3 # [win]
- ipywidgets =8.1.3
Expand All @@ -166,26 +165,26 @@ specs:
- pytest-qt =4.4.0
- pytest-timeout =2.3.1
- pre-commit =3.7.1
- ruff =0.4.10
- ruff =0.5.0
- check-manifest =0.49.0
- codespell =2.3.0
- nitime =0.10.2
- py-spy =0.3.14
- line_profiler =4.1.1
- memory_profiler =0.61.0
- twine =5.1.0
- twine =5.1.1
- hatchling =1.25.0
- hatch-vcs =0.4.0
- mypy =1.10.1
- towncrier =23.11.0
- vulture =2.7
# Doc building
- numpydoc =1.7.0
- pydata-sphinx-theme =0.15.3
- graphviz =9.0.0
- pydata-sphinx-theme =0.15.4
- graphviz =11.0.0
- python-graphviz =0.20.3
- selenium =4.22.0
- sphinx =7.2.6
- sphinx =7.3.7
- sphinx-design =0.6.0
- sphinx-gallery =0.16.0
- sphinxcontrib-bibtex =2.6.2
Expand Down
5 changes: 4 additions & 1 deletion tests/test_imports.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,10 @@ def check_min_version(package, min_version):
import fooof
import openneuro
import sleepecg
import yasa

# Doesn't work with SciPy 1.14 and PR to fix it has not been merged:
# https://github.com/raphaelvallat/yasa/pull/171
# import yasa
import neurokit2
import questionary
import matplotlib.pyplot
Expand Down
10 changes: 1 addition & 9 deletions tests/test_outdated.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,7 @@ class Package: # noqa: D101
version_conda_forge: str | None = None


allowed_outdated: set[str] = {
"python", # 3.12.3 needs libexpat >2.6 but VTK not happy about it
"sphinx", # 7.3 compat in progress
"graphviz", # conflicts with VTK 9.2.6 via libexpat
"vtk", # 9.3.0 is out but mayavi (at least) hasn't been migrated
"numba", # conflicts with VTK 9.2.6
# https://github.com/raphaelvallat/yasa/pull/171
"scipy", # 1.14 drops a function used by yasa
}
allowed_outdated: set[str] = set()
packages: list[Package] = []

for spec in specs:
Expand Down