From 467bf48a0b4bc27abecc9a2c8678fda07185a683 Mon Sep 17 00:00:00 2001 From: liamhuber Date: Fri, 2 May 2025 07:00:32 -0700 Subject: [PATCH 1/3] Keep just the unit tests As a sanity check while working on the docs Signed-off-by: liamhuber --- .github/workflows/induce-failure.yml | 55 ------------------- .../{cached-action.yml => unit-tests.yml} | 2 +- .github/workflows/unittests.yml | 55 ------------------- 3 files changed, 1 insertion(+), 111 deletions(-) delete mode 100644 .github/workflows/induce-failure.yml rename .github/workflows/{cached-action.yml => unit-tests.yml} (94%) delete mode 100644 .github/workflows/unittests.yml diff --git a/.github/workflows/induce-failure.yml b/.github/workflows/induce-failure.yml deleted file mode 100644 index 9662ff0bb..000000000 --- a/.github/workflows/induce-failure.yml +++ /dev/null @@ -1,55 +0,0 @@ -# Trying to track down the conda env failures - -name: Induce failure - -on: - push: - branches: [ main ] - pull_request: - workflow_dispatch: - -jobs: - tests: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - uses: pyiron/actions/add-to-python-path@use_miniconda - with: - path-dirs: tests tests/benchmark tests/integration tests/static tests/unit # For executorlib - - uses: pyiron/actions/write-environment@use_miniconda - with: - env-files: .ci_support/environment.yml - - name: Cat env file - shell: bash -l {0} - run: | - echo "ENV" - cat ${{ env.WRITE_ENVIRONMENT_OUTPUT_ENV_FILE }} - - name: Setup miniconda - uses: conda-incubator/setup-miniconda@v3 - with: - python-version: '3.12' - miniforge-variant: Miniforge3 - miniforge-version: 'latest' - channels: conda-forge - conda-remove-defaults: 'true' - channel-priority: strict - activate-environment: cached-miniforge/my-env - environment-file: ${{ env.WRITE_ENVIRONMENT_OUTPUT_ENV_FILE }} - - name: Display env info - shell: bash -l {0} - run: | - conda info - conda list - - name: Install versioneer - shell: bash -l {0} - run: | - pip install versioneer[toml]==0.29 - - name: Install local code without build isolation - shell: bash -l {0} - run: | - pip install --no-deps . --no-build-isolation - - name: Test - shell: bash -l {0} - run: | - python -m unittest discover tests/unit \ No newline at end of file diff --git a/.github/workflows/cached-action.yml b/.github/workflows/unit-tests.yml similarity index 94% rename from .github/workflows/cached-action.yml rename to .github/workflows/unit-tests.yml index 91c68271c..85e271657 100644 --- a/.github/workflows/cached-action.yml +++ b/.github/workflows/unit-tests.yml @@ -1,6 +1,6 @@ # Trying to track down the conda env failures -name: Cached action +name: setup-miniforge then unit tests on: push: diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml deleted file mode 100644 index 0ca1676dd..000000000 --- a/.github/workflows/unittests.yml +++ /dev/null @@ -1,55 +0,0 @@ -# Trying to track down the conda env failures - -name: Unit tests - -on: - push: - branches: [ main ] - pull_request: - workflow_dispatch: - -jobs: - tests: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - uses: pyiron/actions/add-to-python-path@use_miniconda - with: - path-dirs: tests tests/benchmark tests/integration tests/static tests/unit # For executorlib - - uses: pyiron/actions/write-environment@use_miniconda - with: - env-files: .ci_support/environment.yml - - name: Cat env file - shell: bash -l {0} - run: | - echo "ENV" - cat ${{ env.WRITE_ENVIRONMENT_OUTPUT_ENV_FILE }} - - name: Setup miniconda - uses: conda-incubator/setup-miniconda@v3 - with: - python-version: '3.12' - miniforge-variant: Miniforge3 - miniforge-version: 'latest' - channels: conda-forge - conda-remove-defaults: 'true' - channel-priority: strict - activate-environment: my-env - environment-file: ${{ env.WRITE_ENVIRONMENT_OUTPUT_ENV_FILE }} - - name: Display env info - shell: bash -l {0} - run: | - conda info - conda list - - name: Install versioneer - shell: bash -l {0} - run: | - pip install versioneer[toml]==0.29 - - name: Install local code without build isolation - shell: bash -l {0} - run: | - pip install --no-deps . --no-build-isolation - - name: Test - shell: bash -l {0} - run: | - python -m unittest discover tests/unit \ No newline at end of file From 8ee9acc46889946cebba9a83a60f22210381febf Mon Sep 17 00:00:00 2001 From: liamhuber Date: Fri, 2 May 2025 07:10:48 -0700 Subject: [PATCH 2/3] Make a local flow for building the docs It uses cached-miniforge, but this is already verified to be working now. So the idea is to manipulate this locally until this passes and the centralized one fails, then merge changes from here to the central resource and sync their success. Signed-off-by: liamhuber --- .ci_support/environment-docs.yml | 9 +++++++++ .github/workflows/centralized-docs.yml | 19 +++++++++++++++++ .github/workflows/local-docs.yml | 28 ++++++++++++++++++++++++++ 3 files changed, 56 insertions(+) create mode 100644 .ci_support/environment-docs.yml create mode 100644 .github/workflows/centralized-docs.yml create mode 100644 .github/workflows/local-docs.yml diff --git a/.ci_support/environment-docs.yml b/.ci_support/environment-docs.yml new file mode 100644 index 000000000..1269a639f --- /dev/null +++ b/.ci_support/environment-docs.yml @@ -0,0 +1,9 @@ +channels: + - conda-forge +dependencies: + - ipykernel + - myst-parser + - nbsphinx + - sphinx-gallery + - sphinx-rtd-theme + - versioneer diff --git a/.github/workflows/centralized-docs.yml b/.github/workflows/centralized-docs.yml new file mode 100644 index 000000000..420a62765 --- /dev/null +++ b/.github/workflows/centralized-docs.yml @@ -0,0 +1,19 @@ +# Trying to track down the recent upstream breaks of building docs + +name: setup-miniforge then unit tests + +on: + push: + branches: [ main ] + pull_request: + workflow_dispatch: + +jobs: + tests: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + - uses: pyiron/actions/build-docs@use_miniconda + with: + python-version: '3.12' diff --git a/.github/workflows/local-docs.yml b/.github/workflows/local-docs.yml new file mode 100644 index 000000000..0d06951fb --- /dev/null +++ b/.github/workflows/local-docs.yml @@ -0,0 +1,28 @@ +# Trying to track down the recent upstream breaks of building docs + +name: setup-miniforge then unit tests + +on: + push: + branches: [ main ] + pull_request: + workflow_dispatch: + +jobs: + tests: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + - uses: pyiron/actions/cached-miniforge@use_miniconda + with: + python-version: '3.12' + env-files: .ci_support/environment-docs.yml .ci_support/environment.yml +# - uses: pyiron/actions/pyiron-config@use_miniconda + - name: Build sphinx documentation + shell: bash -l {0} + run: | + mkdir public_html + cd docs + sphinx-build -b html ./ ../public_html || exit 1; + cd .. From 758c533660f3dab350a7998f6e5552203befb62d Mon Sep 17 00:00:00 2001 From: liamhuber Date: Fri, 2 May 2025 07:14:41 -0700 Subject: [PATCH 3/3] Rename workflows Signed-off-by: liamhuber --- .github/workflows/centralized-docs.yml | 2 +- .github/workflows/local-docs.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/centralized-docs.yml b/.github/workflows/centralized-docs.yml index 420a62765..8ea65bf69 100644 --- a/.github/workflows/centralized-docs.yml +++ b/.github/workflows/centralized-docs.yml @@ -1,6 +1,6 @@ # Trying to track down the recent upstream breaks of building docs -name: setup-miniforge then unit tests +name: centralized docs on: push: diff --git a/.github/workflows/local-docs.yml b/.github/workflows/local-docs.yml index 0d06951fb..8a54279ae 100644 --- a/.github/workflows/local-docs.yml +++ b/.github/workflows/local-docs.yml @@ -1,6 +1,6 @@ # Trying to track down the recent upstream breaks of building docs -name: setup-miniforge then unit tests +name: local docs on: push: