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
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ repos:
language: python
entry: ./tools/hooks/sync_dependencies.py
files: '^(pyproject.toml|tools/hooks/sync_dependencies.py)$'
additional_dependencies: ["mne==1.10.0"]
additional_dependencies: ["mne==1.11.0"]

# zizmor
- repo: https://github.com/woodruffw/zizmor-pre-commit
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2011-2024 MNE-Python authors
Copyright 2011-2025 MNE-Python authors

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ The minimum required dependencies to run MNE-Python are:
.. ↓↓↓ BEGIN CORE DEPS LIST. DO NOT EDIT! HANDLED BY PRE-COMMIT HOOK ↓↓↓

- `Python <https://www.python.org>`__ ≥ 3.10
- `NumPy <https://numpy.org>`__ ≥ 1.25
- `NumPy <https://numpy.org>`__ ≥ 1.26
- `SciPy <https://scipy.org>`__ ≥ 1.11
- `Matplotlib <https://matplotlib.org>`__ ≥ 3.7
- `Matplotlib <https://matplotlib.org>`__ ≥ 3.8
- `Pooch <https://www.fatiando.org/pooch/latest/>`__ ≥ 1.5
- `tqdm <https://tqdm.github.io>`__
- `Jinja2 <https://palletsprojects.com/p/jinja/>`__
Expand Down
5 changes: 5 additions & 0 deletions doc/changes/dev.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.. See doc/development/contributing.rst for description of how to add entries.

.. _current:

.. towncrier-draft-entries:: Version |release| (development)
1 change: 1 addition & 0 deletions doc/development/whats_new.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Changes for each version of MNE-Python are listed below.
.. toctree::
:maxdepth: 1

../changes/dev.rst
../changes/v1.11.rst
../changes/v1.10.rst
../changes/v1.9.rst
Expand Down
1 change: 1 addition & 0 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,5 @@ dependencies:
- vtk >=9.2
- xlrd
- pip:
- nest-asyncio2
- pyobjc-framework-Cocoa >=5.2.0;platform_system=='Darwin'
1 change: 1 addition & 0 deletions mne/io/ant/tests/test_ant.py
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,7 @@ def test_io_info_parse_misc(ca_208: TypeDataset):
assert raw_cnt.get_channel_types() == ["eeg"] * len(raw_cnt.ch_names)


@testing.requires_testing_data
def test_io_info_parse_non_standard_misc(na_271_bips: TypeDataset):
"""Test parsing misc channels with modified names from a .cnt file."""
with pytest.warns(
Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ keywords = [
"neuroscience",
]
license = "BSD-3-Clause"
license-files = ["LICENSE"]
license-files = ["LICENSE.txt"]
maintainers = [{email = "[email protected]", name = "Dan McCloy"}]
name = "mne"
readme = {content-type = "text/x-rst", file = "README.rst"}
Expand Down Expand Up @@ -150,6 +150,7 @@ full-no-qt = [
"mne-qt-browser",
"mne[hdf5]",
"neo",
"nest-asyncio2",
"nibabel",
"nilearn",
"numba",
Expand Down
3 changes: 2 additions & 1 deletion tools/hooks/update_environment_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
recursive_deps = set(d for d in deps if d.startswith("mne["))
deps -= recursive_deps
deps |= {"pip", "mamba", "nomkl"}
deps -= {"nest-asyncio2"} # not on CF yet


def remove_spaces(version_spec):
Expand All @@ -46,7 +47,7 @@ def split_dep(dep):

# split package name from version spec
translations = dict(neo="python-neo")
pip_deps = set()
pip_deps = {" - nest-asyncio2"}
conda_deps = set()
for dep in deps:
package_name, version_spec = split_dep(dep)
Expand Down
2 changes: 1 addition & 1 deletion tools/install_pre_requirements.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ python -m pip install $STD_ARGS \
git+https://github.com/BUNPC/pysnirf2 \
git+https://github.com/the-siesta-group/edfio \
git+https://github.com/python-quantities/python-quantities \
trame trame-vtk trame-vuetify jupyter ipyevents ipympl openmeeg \
trame trame-vtk trame-vuetify nest-asyncio2 jupyter ipyevents ipympl openmeeg \
imageio-ffmpeg xlrd mffpy traitlets pybv eeglabio defusedxml \
antio curryreader
echo "::endgroup::"
Expand Down
Loading