diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index da94ae62dac..df2c361ac93 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -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 diff --git a/LICENSE.txt b/LICENSE.txt index d30bf7507fb..8e4a81bec1e 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -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: diff --git a/README.rst b/README.rst index 150dd3107b8..962887a4e62 100644 --- a/README.rst +++ b/README.rst @@ -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 `__ ≥ 3.10 -- `NumPy `__ ≥ 1.25 +- `NumPy `__ ≥ 1.26 - `SciPy `__ ≥ 1.11 -- `Matplotlib `__ ≥ 3.7 +- `Matplotlib `__ ≥ 3.8 - `Pooch `__ ≥ 1.5 - `tqdm `__ - `Jinja2 `__ diff --git a/doc/changes/dev.rst b/doc/changes/dev.rst new file mode 100644 index 00000000000..0e80d522b51 --- /dev/null +++ b/doc/changes/dev.rst @@ -0,0 +1,5 @@ +.. See doc/development/contributing.rst for description of how to add entries. + +.. _current: + +.. towncrier-draft-entries:: Version |release| (development) diff --git a/doc/development/whats_new.rst b/doc/development/whats_new.rst index ccb695d9891..79bf102a2b3 100644 --- a/doc/development/whats_new.rst +++ b/doc/development/whats_new.rst @@ -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 diff --git a/environment.yml b/environment.yml index b72d39925e4..76a9780fb21 100644 --- a/environment.yml +++ b/environment.yml @@ -64,4 +64,5 @@ dependencies: - vtk >=9.2 - xlrd - pip: + - nest-asyncio2 - pyobjc-framework-Cocoa >=5.2.0;platform_system=='Darwin' diff --git a/mne/io/ant/tests/test_ant.py b/mne/io/ant/tests/test_ant.py index 8c8530d400d..1db1577f913 100644 --- a/mne/io/ant/tests/test_ant.py +++ b/mne/io/ant/tests/test_ant.py @@ -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( diff --git a/pyproject.toml b/pyproject.toml index dbd544e571d..33e03f2d3de 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -112,7 +112,7 @@ keywords = [ "neuroscience", ] license = "BSD-3-Clause" -license-files = ["LICENSE"] +license-files = ["LICENSE.txt"] maintainers = [{email = "dan@mccloy.info", name = "Dan McCloy"}] name = "mne" readme = {content-type = "text/x-rst", file = "README.rst"} @@ -150,6 +150,7 @@ full-no-qt = [ "mne-qt-browser", "mne[hdf5]", "neo", + "nest-asyncio2", "nibabel", "nilearn", "numba", diff --git a/tools/hooks/update_environment_file.py b/tools/hooks/update_environment_file.py index 023700dd3c7..91736d68aae 100755 --- a/tools/hooks/update_environment_file.py +++ b/tools/hooks/update_environment_file.py @@ -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): @@ -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) diff --git a/tools/install_pre_requirements.sh b/tools/install_pre_requirements.sh index c2b60366a18..748ac99d984 100755 --- a/tools/install_pre_requirements.sh +++ b/tools/install_pre_requirements.sh @@ -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::"