From bbd51d6b78fa96122147d75945fcf2c886c06bb0 Mon Sep 17 00:00:00 2001 From: jnnr <32454596+jnnr@users.noreply.github.com> Date: Mon, 15 Jun 2026 14:47:25 +0200 Subject: [PATCH 1/8] Add links to mkdocs.yaml --- mkdocs.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mkdocs.yml b/mkdocs.yml index 3f73e4b..e7b8bc3 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -1,5 +1,7 @@ site_name: Gregor copyright: Copyright © since 2024 (MIT licensed) +site_url: https://gregor.readthedocs.io/en/latest/ +repo_url: https://github.com/modelblocks-org/gregor nav: - Getting started: index.md - Examples: From 4c0a4dd2eb1ee46c19548439df603faca93c6065 Mon Sep 17 00:00:00 2001 From: jnnr <32454596+jnnr@users.noreply.github.com> Date: Thu, 18 Jun 2026 21:20:12 +0200 Subject: [PATCH 2/8] Attempt to fix docs build by reducing base depencies --- requirements/base.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index a869d70..0457e9a 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -2,7 +2,6 @@ pandas >= 1.2 numpy matplotlib geopandas -pyarrow dask xarray rasterio From 9bef5e7f7e2d1c4e649f837349046cb59f14e191 Mon Sep 17 00:00:00 2001 From: jnnr <32454596+jnnr@users.noreply.github.com> Date: Fri, 19 Jun 2026 11:04:51 +0200 Subject: [PATCH 3/8] Separate testing and docs requirements --- .github/workflows/ci-tests.yaml | 2 +- .readthedocs.yaml | 2 +- requirements/{dev.txt => docs.txt} | 3 +-- requirements/test.txt | 1 + 4 files changed, 4 insertions(+), 4 deletions(-) rename requirements/{dev.txt => docs.txt} (66%) create mode 100644 requirements/test.txt diff --git a/.github/workflows/ci-tests.yaml b/.github/workflows/ci-tests.yaml index edfa83c..7caafbb 100644 --- a/.github/workflows/ci-tests.yaml +++ b/.github/workflows/ci-tests.yaml @@ -29,7 +29,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install -e ".[dev]" + pip install -e ".[test]" - name: Test with pytest run: | # not run benchmark test diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 8765b31..51234ef 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -7,7 +7,7 @@ build: python: mambaforge-4.10 jobs: post_create_environment: - - conda install python=3.12 --file requirements/dev.txt + - conda install python=3.12 --file requirements/docs.txt - pip install --no-deps . mkdocs: diff --git a/requirements/dev.txt b/requirements/docs.txt similarity index 66% rename from requirements/dev.txt rename to requirements/docs.txt index 84b9aba..27efc3a 100644 --- a/requirements/dev.txt +++ b/requirements/docs.txt @@ -1,5 +1,4 @@ mkdocs-material mkdocstrings[python] mkdocs-jupyter -mkdocstrings-python -pytest \ No newline at end of file +mkdocstrings-python \ No newline at end of file diff --git a/requirements/test.txt b/requirements/test.txt new file mode 100644 index 0000000..55b033e --- /dev/null +++ b/requirements/test.txt @@ -0,0 +1 @@ +pytest \ No newline at end of file From 3fc6449f66f29f6adccc3f862c7eaf861517c0ea Mon Sep 17 00:00:00 2001 From: jnnr <32454596+jnnr@users.noreply.github.com> Date: Fri, 19 Jun 2026 11:50:27 +0200 Subject: [PATCH 4/8] Simplify .readthedocs.yaml --- .readthedocs.yaml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 51234ef..1df1c40 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -1,14 +1,10 @@ version: 2 -conda: - environment: requirements/base.txt -build: - os: ubuntu-22.04 - tools: - python: mambaforge-4.10 - jobs: - post_create_environment: - - conda install python=3.12 --file requirements/docs.txt - - pip install --no-deps . +python: + install: + - method: pip + path: . + extra_requirements: + - docs mkdocs: configuration: mkdocs.yml \ No newline at end of file From f48fcc783b9a27e7dcd8daaef526896df350ec17 Mon Sep 17 00:00:00 2001 From: jnnr <32454596+jnnr@users.noreply.github.com> Date: Fri, 19 Jun 2026 11:53:46 +0200 Subject: [PATCH 5/8] Adapt .readthedocs.yaml --- .readthedocs.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 1df1c40..4faeaaf 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -1,4 +1,10 @@ version: 2 + +build: + os: ubuntu-22.04 + tools: + python: "3.12" + python: install: - method: pip From b63c585c9678b77a348d591c0604736e68c89615 Mon Sep 17 00:00:00 2001 From: jnnr <32454596+jnnr@users.noreply.github.com> Date: Fri, 19 Jun 2026 12:03:12 +0200 Subject: [PATCH 6/8] Remove emoji dependency --- mkdocs.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/mkdocs.yml b/mkdocs.yml index e7b8bc3..5b06b70 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -77,9 +77,6 @@ markdown_extensions: smart_enable: all - pymdownx.caret - pymdownx.details - - pymdownx.emoji: - emoji_index: !!python/name:material.extensions.emoji.twemoji - emoji_generator: !!python/name:material.extensions.emoji.to_svg - pymdownx.highlight - pymdownx.inlinehilite - pymdownx.keys From 0feb049c6a4d0650f4a69385fc9ce0f5c631045e Mon Sep 17 00:00:00 2001 From: jnnr <32454596+jnnr@users.noreply.github.com> Date: Fri, 19 Jun 2026 13:09:48 +0200 Subject: [PATCH 7/8] Revert "Separate testing and docs requirements" This reverts commit 9bef5e7f7e2d1c4e649f837349046cb59f14e191. --- .github/workflows/ci-tests.yaml | 2 +- .readthedocs.yaml | 2 +- requirements/{docs.txt => dev.txt} | 3 ++- requirements/test.txt | 1 - 4 files changed, 4 insertions(+), 4 deletions(-) rename requirements/{docs.txt => dev.txt} (66%) delete mode 100644 requirements/test.txt diff --git a/.github/workflows/ci-tests.yaml b/.github/workflows/ci-tests.yaml index 7caafbb..edfa83c 100644 --- a/.github/workflows/ci-tests.yaml +++ b/.github/workflows/ci-tests.yaml @@ -29,7 +29,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install -e ".[test]" + pip install -e ".[dev]" - name: Test with pytest run: | # not run benchmark test diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 4faeaaf..9c771cb 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -10,7 +10,7 @@ python: - method: pip path: . extra_requirements: - - docs + - dev mkdocs: configuration: mkdocs.yml \ No newline at end of file diff --git a/requirements/docs.txt b/requirements/dev.txt similarity index 66% rename from requirements/docs.txt rename to requirements/dev.txt index 27efc3a..84b9aba 100644 --- a/requirements/docs.txt +++ b/requirements/dev.txt @@ -1,4 +1,5 @@ mkdocs-material mkdocstrings[python] mkdocs-jupyter -mkdocstrings-python \ No newline at end of file +mkdocstrings-python +pytest \ No newline at end of file diff --git a/requirements/test.txt b/requirements/test.txt deleted file mode 100644 index 55b033e..0000000 --- a/requirements/test.txt +++ /dev/null @@ -1 +0,0 @@ -pytest \ No newline at end of file From 9f810e158fb7b866b01c34d7edb1a7195dfc6450 Mon Sep 17 00:00:00 2001 From: jnnr <32454596+jnnr@users.noreply.github.com> Date: Fri, 19 Jun 2026 13:46:07 +0200 Subject: [PATCH 8/8] Remove failing dependencies --- mkdocs.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mkdocs.yml b/mkdocs.yml index 5b06b70..d676615 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -55,10 +55,6 @@ plugins: inherited_members: true docstring_style: numpy paths: [src] - import: - - https://docs.python.org/3/objects.inv - - https://pandas.pydata.org/docs/objects.inv - - https://docs.xarray.dev/en/stable/objects.inv markdown_extensions: # Python Markdown - abbr