From 43f94f26ae40eb628f5eb1396c5a9da649418ea4 Mon Sep 17 00:00:00 2001 From: Espen Hagen <2492641+espenhgn@users.noreply.github.com> Date: Fri, 10 Apr 2026 11:15:55 +0200 Subject: [PATCH 1/4] fix readthedocs builld Fixes #202 --- .readthedocs.yml => .readthedocs.yaml | 11 ++++++----- lfpykit/version.py | 2 +- pyproject.toml | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) rename .readthedocs.yml => .readthedocs.yaml (59%) diff --git a/.readthedocs.yml b/.readthedocs.yaml similarity index 59% rename from .readthedocs.yml rename to .readthedocs.yaml index 596dce0..7ca6cc5 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yaml @@ -6,13 +6,14 @@ sphinx: formats: all build: - image: latest + os: ubuntu-lts-latest + tools: + python: "3.10" conda: environment: doc/source/environment.yml python: - version: "3" - install: - - method: pip - path: . + install: + - method: pip + path: . diff --git a/lfpykit/version.py b/lfpykit/version.py index aaf05b3..974881c 100644 --- a/lfpykit/version.py +++ b/lfpykit/version.py @@ -1 +1 @@ -version = "0.6.0" +version = "0.6.1" diff --git a/pyproject.toml b/pyproject.toml index 77af28f..c07896d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "LFPykit" -version = "0.6.0" +version = "0.6.1" description = "Electrostatic models for multicompartment neuron models" authors = ["LFPy-team "] From 3f4eef26d0abbed6650be4266ee47adc0b52e66b Mon Sep 17 00:00:00 2001 From: Espen Hagen <2492641+espenhgn@users.noreply.github.com> Date: Fri, 10 Apr 2026 11:21:46 +0200 Subject: [PATCH 2/4] Update lfpykit/version.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- lfpykit/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lfpykit/version.py b/lfpykit/version.py index 974881c..aaf05b3 100644 --- a/lfpykit/version.py +++ b/lfpykit/version.py @@ -1 +1 @@ -version = "0.6.1" +version = "0.6.0" From 14f440afcd89d10f01b3066eccf39cda27a92c3c Mon Sep 17 00:00:00 2001 From: Espen Hagen <2492641+espenhgn@users.noreply.github.com> Date: Fri, 10 Apr 2026 11:41:11 +0200 Subject: [PATCH 3/4] fix broken rtfd build --- .readthedocs.yaml | 7 +------ doc/source/environment.yml | 1 + 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 7ca6cc5..16db35e 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -8,12 +8,7 @@ formats: all build: os: ubuntu-lts-latest tools: - python: "3.10" + python: "3.12" conda: environment: doc/source/environment.yml - -python: - install: - - method: pip - path: . diff --git a/doc/source/environment.yml b/doc/source/environment.yml index 6c25119..21b7eb1 100644 --- a/doc/source/environment.yml +++ b/doc/source/environment.yml @@ -11,3 +11,4 @@ dependencies: - m2r2 - pip - pip: + - . From 796a8576dbc7ece8c4d4d14818756fd6bb8e7e11 Mon Sep 17 00:00:00 2001 From: Espen Hagen <2492641+espenhgn@users.noreply.github.com> Date: Fri, 10 Apr 2026 11:59:09 +0200 Subject: [PATCH 4/4] conda to standard python env --- .readthedocs.yaml | 7 +++++-- doc/source/conf.py | 6 +++++- doc/source/environment.yml | 14 -------------- doc/source/requirements-rtd.txt | 4 ++++ 4 files changed, 14 insertions(+), 17 deletions(-) delete mode 100644 doc/source/environment.yml create mode 100644 doc/source/requirements-rtd.txt diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 16db35e..cfc3410 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -10,5 +10,8 @@ build: tools: python: "3.12" -conda: - environment: doc/source/environment.yml +python: + install: + - requirements: doc/source/requirements-rtd.txt + - method: pip + path: . diff --git a/doc/source/conf.py b/doc/source/conf.py index f34963f..12e026b 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -57,7 +57,11 @@ # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. # This pattern also affects html_static_path and html_extra_path. -exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store'] +exclude_patterns = [ + '_build', + 'Thumbs.db', + '.DS_Store' +] # -- Options for HTML output ------------------------------------------------- diff --git a/doc/source/environment.yml b/doc/source/environment.yml deleted file mode 100644 index 21b7eb1..0000000 --- a/doc/source/environment.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: lfpykit -channels: - - conda-forge - - defaults -dependencies: - - python=3 - - numpy - - meautility - - sphinx_rtd_theme - - numpydoc - - m2r2 - - pip - - pip: - - . diff --git a/doc/source/requirements-rtd.txt b/doc/source/requirements-rtd.txt new file mode 100644 index 0000000..f005877 --- /dev/null +++ b/doc/source/requirements-rtd.txt @@ -0,0 +1,4 @@ +sphinx +sphinx_rtd_theme +numpydoc +m2r2