From 358c8a69313990d2db5fdc0a6ff60ccf77a0d224 Mon Sep 17 00:00:00 2001 From: "Adam R. Jensen" <39184289+AdamRJensen@users.noreply.github.com> Date: Sun, 21 Jun 2026 13:32:41 +0200 Subject: [PATCH 1/5] Fix marimo example --- docs/examples/quality/example.py | 2 +- {docs/source/notebooks => notebooks}/example.py | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename {docs/source/notebooks => notebooks}/example.py (100%) diff --git a/docs/examples/quality/example.py b/docs/examples/quality/example.py index 796a479..dcf24a3 100644 --- a/docs/examples/quality/example.py +++ b/docs/examples/quality/example.py @@ -2,7 +2,7 @@ Multiplot ========= -.. marimo:: notebooks/example.py +.. marimo:: example.py :height: 800px :width: 100% :theme: light diff --git a/docs/source/notebooks/example.py b/notebooks/example.py similarity index 100% rename from docs/source/notebooks/example.py rename to notebooks/example.py From 54f2e9efe65be71a9c999db610b62e73e1526387 Mon Sep 17 00:00:00 2001 From: "Adam R. Jensen" <39184289+AdamRJensen@users.noreply.github.com> Date: Sun, 21 Jun 2026 13:42:43 +0200 Subject: [PATCH 2/5] Fix linter --- notebooks/example.py | 2 +- pyproject.toml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/notebooks/example.py b/notebooks/example.py index 38a4262..aa47544 100644 --- a/notebooks/example.py +++ b/notebooks/example.py @@ -69,4 +69,4 @@ def __(mo): if __name__ == "__main__": - app.run() \ No newline at end of file + app.run() diff --git a/pyproject.toml b/pyproject.toml index b925a08..04440f0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -67,6 +67,9 @@ Issues = "https://github.com/assessingsolar/solarpy/issues" Repository = "https://github.com/assessingsolar/solarpy.git" Changelog = "https://github.com/assessingsolar/solarpy/blob/main/docs/source/whatsnew.md" +[tool.ruff.lint.per-file-ignores] +"notebooks/*.py" = ["F811"] + [tool.pytest.ini_options] addopts = "--cov=solarpy --cov-fail-under=1 --cov-report=term-missing --doctest-modules" pythonpath = ["src"] From 235045b224e7a84dc82c22299f4258d2f79deb3c Mon Sep 17 00:00:00 2001 From: "Adam R. Jensen" <39184289+AdamRJensen@users.noreply.github.com> Date: Sun, 21 Jun 2026 13:48:44 +0200 Subject: [PATCH 3/5] Fix notebook path --- docs/examples/quality/example.rst | 9 --------- {notebooks => docs/notebooks}/example.py | 0 docs/source/conf.py | 3 ++- 3 files changed, 2 insertions(+), 10 deletions(-) delete mode 100644 docs/examples/quality/example.rst rename {notebooks => docs/notebooks}/example.py (100%) diff --git a/docs/examples/quality/example.rst b/docs/examples/quality/example.rst deleted file mode 100644 index b0719bd..0000000 --- a/docs/examples/quality/example.rst +++ /dev/null @@ -1,9 +0,0 @@ -Multiplot ---------- - -Visualizing automatic quality checks can reveal patterns and recoverable data. - -.. marimo:: notebooks/example.py - :height: 800px - :width: 100% - :theme: light diff --git a/notebooks/example.py b/docs/notebooks/example.py similarity index 100% rename from notebooks/example.py rename to docs/notebooks/example.py diff --git a/docs/source/conf.py b/docs/source/conf.py index 76565b0..ac1e5d9 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -39,7 +39,8 @@ "sphinx_marimo", # for including interactive marimo notebooks ] -marimo_notebook_dir = "notebooks" # Directory containing .py Marimo notebooks +# Directory containing Marimo notebooks, relative to conf.py file +marimo_notebook_dir = "../notebooks" myst_enable_extensions = ["colon_fence"] # for sphinx-design From 4c6e1573c135d3f60e71234b80a3f13718be5337 Mon Sep 17 00:00:00 2001 From: "Adam R. Jensen" <39184289+AdamRJensen@users.noreply.github.com> Date: Sun, 21 Jun 2026 13:49:34 +0200 Subject: [PATCH 4/5] Fix ruff lint path --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 04440f0..4816483 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -68,7 +68,7 @@ Repository = "https://github.com/assessingsolar/solarpy.git" Changelog = "https://github.com/assessingsolar/solarpy/blob/main/docs/source/whatsnew.md" [tool.ruff.lint.per-file-ignores] -"notebooks/*.py" = ["F811"] +"docs/notebooks/*.py" = ["F811"] [tool.pytest.ini_options] addopts = "--cov=solarpy --cov-fail-under=1 --cov-report=term-missing --doctest-modules" From 383157a6e22d27bdaf5277f922b431bb0d694b19 Mon Sep 17 00:00:00 2001 From: "Adam R. Jensen" <39184289+AdamRJensen@users.noreply.github.com> Date: Sun, 21 Jun 2026 13:58:59 +0200 Subject: [PATCH 5/5] Format lint for flake8 and not ruff --- .flake8 | 1 + pyproject.toml | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.flake8 b/.flake8 index e81a59c..b371821 100644 --- a/.flake8 +++ b/.flake8 @@ -4,3 +4,4 @@ per-file-ignores = # sphinx-gallery examples use `# %%` section breaks, so imports # are not necessarily at the top of the file docs/examples/*.py:E402 + docs/notebooks/*.py:F811 diff --git a/pyproject.toml b/pyproject.toml index 4816483..b925a08 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -67,9 +67,6 @@ Issues = "https://github.com/assessingsolar/solarpy/issues" Repository = "https://github.com/assessingsolar/solarpy.git" Changelog = "https://github.com/assessingsolar/solarpy/blob/main/docs/source/whatsnew.md" -[tool.ruff.lint.per-file-ignores] -"docs/notebooks/*.py" = ["F811"] - [tool.pytest.ini_options] addopts = "--cov=solarpy --cov-fail-under=1 --cov-report=term-missing --doctest-modules" pythonpath = ["src"]