diff --git a/CondaPkg.toml b/CondaPkg.toml index 5d7a99d..48662e3 100644 --- a/CondaPkg.toml +++ b/CondaPkg.toml @@ -2,10 +2,13 @@ channels = ["anaconda", "conda-forge"] [deps] # Conda package names and versions -python = ">=3.7,<4" +python = ">=3.4,<4" # see https://mne.tools/stable/install/manual_install.html#installing-mne-python-with-all-dependencies # CondaPkg uses mamba by default -mne = ">=1.0, <2" +# currently broken when using conda deps +# xref: https://github.com/beacon-biosignals/PyMNE.jl/issues/17 +# xref: https://github.com/cjdoris/PythonCall.jl/issues/315 +# mne = ">=1.4" [pip.deps] -# Pip package names and versions +mne = ">=1.4" diff --git a/Project.toml b/Project.toml index f298787..8cd69ea 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "PyMNE" uuid = "6c5003b2-cbe8-491c-a0d1-70088e6a0fd6" authors = ["Beacon Biosignals, Inc."] -version = "0.2.1" +version = "0.2.2" [deps] CondaPkg = "992eb4ea-22a4-4c89-a5bb-47a3300528ab" diff --git a/README.md b/README.md index 4bfd9af..5402735 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,7 @@ This package uses [`PythonCall`](https://cjdoris.github.io/PythonCall.jl) to mak MNE-Python and its dependencies need to be installed in order for this to work and PyMNE will attempt to install when the package is built: this should happen more or less automatically via [`CondaPkg`](https://github.com/cjdoris/CondaPkg.jl). -You can configure various options via `CondaPkg`. MNE-Python is installed via -Conda, not via pip. +You can configure various options via `CondaPkg`. ## Usage @@ -36,7 +35,7 @@ You need to explicitly convert vectors of strings to a `PyList`. For instance ```julia data = raw.get_data(picks=["Oz","Cz"]) ``` -does not work, whereas +does not work, whereas ```julia data = raw.get_data(picks=pylist(["Oz","Cz"])) ```