From 36dcd0202e1580f232399329efeed02a1a8bc38b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Jan=C3=9Fen?= Date: Mon, 27 Nov 2023 16:25:38 +0100 Subject: [PATCH 1/5] Update readthedocs environment --- .readthedocs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index b4de3480..3e4be55b 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -6,9 +6,9 @@ version: 2 build: - os: "ubuntu-20.04" + os: "ubuntu-22.04" tools: - python: "mambaforge-4.10" + python: "mambaforge-22.9" # Build documentation in the docs/ directory with Sphinx sphinx: From e47af239e9214396ede1d42ec781f96a4913da8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Jan=C3=9Fen?= Date: Mon, 27 Nov 2023 16:38:19 +0100 Subject: [PATCH 2/5] update docs env --- .ci_support/environment-docs.yml | 21 +++++++++++---------- .github/workflows/dependabot.yml | 1 + 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.ci_support/environment-docs.yml b/.ci_support/environment-docs.yml index 1a112178..1df656c6 100644 --- a/.ci_support/environment-docs.yml +++ b/.ci_support/environment-docs.yml @@ -1,13 +1,14 @@ channels: - conda-forge dependencies: - - nbsphinx - - sphinx - - myst-parser - - numpy - - mpich - - cloudpickle - - mpi4py - - tqdm - - pyzmq - - flux-core \ No newline at end of file +- nbsphinx +- sphinx +- myst-parser +- numpy +- openmpi +- cloudpickle =3.0.0 +- mpi4py =3.1.5 +- tqdm =4.66.1 +- pyzmq =25.1.1 +- flux-core +- versioneer =0.29 \ No newline at end of file diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml index 85028d85..74b47f22 100644 --- a/.github/workflows/dependabot.yml +++ b/.github/workflows/dependabot.yml @@ -25,6 +25,7 @@ jobs: sed -i "/${package}/s/${from}/${to}/g" .ci_support/environment-mpich.yml sed -i "/${package}/s/${from}/${to}/g" .ci_support/environment-openmpi.yml sed -i "/${package}/s/${from}/${to}/g" .ci_support/environment-win.yml + sed -i "/${package}/s/${from}/${to}/g" .ci_support/environment-docs.yml - name: UpdateDependabotPR commit run: | git config --local user.email "pyiron@mpie.de" From bc08eb81692ec5bbfb3daa15fe0361a37de9a883 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Jan=C3=9Fen?= Date: Mon, 27 Nov 2023 17:03:06 +0100 Subject: [PATCH 3/5] Overwrite installation --- .readthedocs.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 3e4be55b..00d0319d 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -9,6 +9,10 @@ build: os: "ubuntu-22.04" tools: python: "mambaforge-22.9" + commands: + - pip install versioneer[toml]==0.29 + - pip install . --no-deps --no-build-isolation + - python -m sphinx -T -E -b html -d _build/doctrees -D language=en . $READTHEDOCS_OUTPUT/html # Build documentation in the docs/ directory with Sphinx sphinx: @@ -19,10 +23,4 @@ formats: [] # Install pyiron from conda conda: - environment: .ci_support/environment-docs.yml - -# Optionally set the version of Python and requirements required to build your docs -python: - install: - - method: pip - path: . \ No newline at end of file + environment: .ci_support/environment-docs.yml \ No newline at end of file From 4744d3f26faf295ced3633f1c1bb293b7bf6fa7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Jan=C3=9Fen?= Date: Mon, 27 Nov 2023 17:05:33 +0100 Subject: [PATCH 4/5] continue debugging --- .ci_support/environment-docs.yml | 3 +-- .readthedocs.yml | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.ci_support/environment-docs.yml b/.ci_support/environment-docs.yml index 1df656c6..cb755a1e 100644 --- a/.ci_support/environment-docs.yml +++ b/.ci_support/environment-docs.yml @@ -10,5 +10,4 @@ dependencies: - mpi4py =3.1.5 - tqdm =4.66.1 - pyzmq =25.1.1 -- flux-core -- versioneer =0.29 \ No newline at end of file +- flux-core \ No newline at end of file diff --git a/.readthedocs.yml b/.readthedocs.yml index 00d0319d..fa7d48e9 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -10,6 +10,8 @@ build: tools: python: "mambaforge-22.9" commands: + - cat .ci_support/environment-docs.yml + - mamba env create --quiet --name readthedocs --file .ci_support/environment-docs.yml - pip install versioneer[toml]==0.29 - pip install . --no-deps --no-build-isolation - python -m sphinx -T -E -b html -d _build/doctrees -D language=en . $READTHEDOCS_OUTPUT/html From f7c3ca5bd41d954864ec40ee48046444fa387a80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Jan=C3=9Fen?= Date: Mon, 27 Nov 2023 17:10:44 +0100 Subject: [PATCH 5/5] try pre-build --- .readthedocs.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index fa7d48e9..38c2541e 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -9,12 +9,10 @@ build: os: "ubuntu-22.04" tools: python: "mambaforge-22.9" - commands: - - cat .ci_support/environment-docs.yml - - mamba env create --quiet --name readthedocs --file .ci_support/environment-docs.yml - - pip install versioneer[toml]==0.29 - - pip install . --no-deps --no-build-isolation - - python -m sphinx -T -E -b html -d _build/doctrees -D language=en . $READTHEDOCS_OUTPUT/html + jobs: + pre_build: + - pip install versioneer[toml]==0.29 + - pip install . --no-deps --no-build-isolation # Build documentation in the docs/ directory with Sphinx sphinx: