From ba67f0f870635a2e44c19a210672739bcdf70d5d Mon Sep 17 00:00:00 2001 From: John Stilley Date: Wed, 27 Aug 2025 13:38:10 -0700 Subject: [PATCH 01/36] Trying to speed up docs build --- .github/workflows/docs.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 089b03e377..664db5c2bb 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -22,10 +22,8 @@ jobs: uses: actions/setup-python@v2 with: python-version: 3.13 - - name: Update package index - run: sudo apt-get update - name: Install apt-get libs - run: sudo apt-get -y install texlive-xetex=2021.20220204-1 texlive-latex-base=2021.20220204-1 texlive-fonts-recommended=2021.20220204-1 texlive-latex-extra=2021.20220204-1 texlive-full=2021.20220204-1 pandoc libopenmpi-dev + run: sudo apt-get -y install --fix-missing texlive-xetex=2021.20220204-1 texlive-latex-base=2021.20220204-1 texlive-fonts-recommended=2021.20220204-1 texlive-latex-extra=2021.20220204-1 texlive-full=2021.20220204-1 pandoc libopenmpi-dev - name: Setup Graphviz uses: ts-graphviz/setup-graphviz@v2.0.2 - name: Make html/pdf Docs From 2b7b16696a6bcd01d04d8a9c9853dc51e7cae3be Mon Sep 17 00:00:00 2001 From: John Stilley <1831479+john-science@users.noreply.github.com> Date: Wed, 27 Aug 2025 13:39:20 -0700 Subject: [PATCH 02/36] Trying to speed up docs build --- .github/workflows/docs.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 089b03e377..664db5c2bb 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -22,10 +22,8 @@ jobs: uses: actions/setup-python@v2 with: python-version: 3.13 - - name: Update package index - run: sudo apt-get update - name: Install apt-get libs - run: sudo apt-get -y install texlive-xetex=2021.20220204-1 texlive-latex-base=2021.20220204-1 texlive-fonts-recommended=2021.20220204-1 texlive-latex-extra=2021.20220204-1 texlive-full=2021.20220204-1 pandoc libopenmpi-dev + run: sudo apt-get -y install --fix-missing texlive-xetex=2021.20220204-1 texlive-latex-base=2021.20220204-1 texlive-fonts-recommended=2021.20220204-1 texlive-latex-extra=2021.20220204-1 texlive-full=2021.20220204-1 pandoc libopenmpi-dev - name: Setup Graphviz uses: ts-graphviz/setup-graphviz@v2.0.2 - name: Make html/pdf Docs From 820b7fe3a69afea866332d39618760fd2a91214e Mon Sep 17 00:00:00 2001 From: John Stilley <1831479+john-science@users.noreply.github.com> Date: Thu, 28 Aug 2025 10:38:47 -0700 Subject: [PATCH 03/36] Trying Docker for Docs --- .github/workflows/docs_docker.yaml | 73 ++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 .github/workflows/docs_docker.yaml diff --git a/.github/workflows/docs_docker.yaml b/.github/workflows/docs_docker.yaml new file mode 100644 index 0000000000..3cad2dcb28 --- /dev/null +++ b/.github/workflows/docs_docker.yaml @@ -0,0 +1,73 @@ +name: Documentation using Docker + +on: + push: + branches: + - main + pull_request: + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + build: + container: johnscience/armi + + # Building and deploying docs is broken on forked repos + if: github.repository == 'terrapower/armi' + runs-on: ubuntu-22.04 + + steps: + - name: Setup Graphviz + uses: ts-graphviz/setup-graphviz@v2.0.2 + - name: Make html/pdf Docs + continue-on-error: true + env: + GH_TOKEN: ${{ github.token }} + PR_NUMBER: ${{ github.event.number }} + run: | + echo "Installing ARMI..." + set -x + pip install -U pip + pip install -e .[memprof,mpi,test,docs] + + echo "Run unit tests..." + pytest --junit-xml=test_results.xml -v -n 4 armi > pytest_verbose.log + mpiexec -n 2 --use-hwthread-cpus pytest --junit-xml=test_results_mpi1.xml armi/tests/test_mpiFeatures.py > pytest_verbose_mpi1.log + mpiexec -n 2 --use-hwthread-cpus pytest --junit-xml=test_results_mpi2.xml armi/tests/test_mpiParameters.py > pytest_verbose_mpi2.log + mpiexec -n 2 --use-hwthread-cpus pytest --junit-xml=test_results_mpi3.xml armi/utils/tests/test_directoryChangersMpi.py > pytest_verbose_mpi3.log + python doc/.static/cleanup_test_results.py test_results.xml + + echo "Build HTML docs..." + cd doc + git submodule init + git submodule update + make html + + echo "Build PDF docs..." + make latex + cd _build/latex/ + latexmk -pdf -f -interaction=nonstopmode ARMI.tex + - name: Deploy + if: github.ref == 'refs/heads/main' + uses: JamesIves/github-pages-deploy-action@v4.6.1 + with: + token: ${{ secrets.ACCESS_TOKEN }} + repository-name: ${{ github.repository_owner }}/terrapower.github.io + branch: main + folder: doc/_build/html + target-folder: armi + - name: Archive HTML Docs + if: github.ref != 'refs/heads/main' + uses: actions/upload-artifact@v4 + with: + name: html-docs + path: doc/_build/html + retention-days: 5 + - name: Archive PDF Docs + uses: actions/upload-artifact@v4 + with: + name: pdf-docs + path: doc/_build/latex/ARMI.pdf + retention-days: 5 From 06b2f21d248198a74feb6a56970576e81a983757 Mon Sep 17 00:00:00 2001 From: John Stilley <1831479+john-science@users.noreply.github.com> Date: Thu, 28 Aug 2025 11:25:12 -0700 Subject: [PATCH 04/36] Trying an updated container --- .github/workflows/docs_docker.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/docs_docker.yaml b/.github/workflows/docs_docker.yaml index 3cad2dcb28..7d327d78f1 100644 --- a/.github/workflows/docs_docker.yaml +++ b/.github/workflows/docs_docker.yaml @@ -12,15 +12,13 @@ concurrency: jobs: build: - container: johnscience/armi + container: johnscience/armi:v2 # Building and deploying docs is broken on forked repos if: github.repository == 'terrapower/armi' runs-on: ubuntu-22.04 steps: - - name: Setup Graphviz - uses: ts-graphviz/setup-graphviz@v2.0.2 - name: Make html/pdf Docs continue-on-error: true env: From 15bb4b355ee62fb8cc916b235e9d5c1d5b3ae46d Mon Sep 17 00:00:00 2001 From: John Stilley <1831479+john-science@users.noreply.github.com> Date: Thu, 28 Aug 2025 11:29:50 -0700 Subject: [PATCH 05/36] take 2 --- .github/workflows/docs_docker.yaml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docs_docker.yaml b/.github/workflows/docs_docker.yaml index 7d327d78f1..6e4a0e1750 100644 --- a/.github/workflows/docs_docker.yaml +++ b/.github/workflows/docs_docker.yaml @@ -27,14 +27,15 @@ jobs: run: | echo "Installing ARMI..." set -x - pip install -U pip - pip install -e .[memprof,mpi,test,docs] + which python + python -m pip install -U pip + python -m pip install -e .[memprof,mpi,test,docs] echo "Run unit tests..." - pytest --junit-xml=test_results.xml -v -n 4 armi > pytest_verbose.log - mpiexec -n 2 --use-hwthread-cpus pytest --junit-xml=test_results_mpi1.xml armi/tests/test_mpiFeatures.py > pytest_verbose_mpi1.log - mpiexec -n 2 --use-hwthread-cpus pytest --junit-xml=test_results_mpi2.xml armi/tests/test_mpiParameters.py > pytest_verbose_mpi2.log - mpiexec -n 2 --use-hwthread-cpus pytest --junit-xml=test_results_mpi3.xml armi/utils/tests/test_directoryChangersMpi.py > pytest_verbose_mpi3.log + python -m pytest --junit-xml=test_results.xml -v -n 4 armi > pytest_verbose.log + mpiexec -n 2 --use-hwthread-cpus pytest --junit-xml=test_results_mpi1.xml armi/tests/test_mpiFeatures.py > python -m pytest_verbose_mpi1.log + mpiexec -n 2 --use-hwthread-cpus pytest --junit-xml=test_results_mpi2.xml armi/tests/test_mpiParameters.py > python -m pytest_verbose_mpi2.log + mpiexec -n 2 --use-hwthread-cpus pytest --junit-xml=test_results_mpi3.xml armi/utils/tests/test_directoryChangersMpi.py > python -m pytest_verbose_mpi3.log python doc/.static/cleanup_test_results.py test_results.xml echo "Build HTML docs..." From 65f1640a1416a3992d88a249d655bb50b4f50daa Mon Sep 17 00:00:00 2001 From: John Stilley <1831479+john-science@users.noreply.github.com> Date: Thu, 28 Aug 2025 11:39:44 -0700 Subject: [PATCH 06/36] take3 --- .github/workflows/docs_docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs_docker.yaml b/.github/workflows/docs_docker.yaml index 6e4a0e1750..273349f542 100644 --- a/.github/workflows/docs_docker.yaml +++ b/.github/workflows/docs_docker.yaml @@ -27,7 +27,7 @@ jobs: run: | echo "Installing ARMI..." set -x - which python + which python3.13 python -m pip install -U pip python -m pip install -e .[memprof,mpi,test,docs] From a5626069ff4ff50e8c5a5592a963564734a00be8 Mon Sep 17 00:00:00 2001 From: John Stilley <1831479+john-science@users.noreply.github.com> Date: Thu, 28 Aug 2025 11:42:19 -0700 Subject: [PATCH 07/36] python3.13 take --- .github/workflows/docs_docker.yaml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docs_docker.yaml b/.github/workflows/docs_docker.yaml index 273349f542..4679f5542d 100644 --- a/.github/workflows/docs_docker.yaml +++ b/.github/workflows/docs_docker.yaml @@ -27,16 +27,15 @@ jobs: run: | echo "Installing ARMI..." set -x - which python3.13 - python -m pip install -U pip - python -m pip install -e .[memprof,mpi,test,docs] + python3.13 -m pip install -U pip + python3.13 -m pip install -e .[memprof,mpi,test,docs] echo "Run unit tests..." - python -m pytest --junit-xml=test_results.xml -v -n 4 armi > pytest_verbose.log - mpiexec -n 2 --use-hwthread-cpus pytest --junit-xml=test_results_mpi1.xml armi/tests/test_mpiFeatures.py > python -m pytest_verbose_mpi1.log - mpiexec -n 2 --use-hwthread-cpus pytest --junit-xml=test_results_mpi2.xml armi/tests/test_mpiParameters.py > python -m pytest_verbose_mpi2.log - mpiexec -n 2 --use-hwthread-cpus pytest --junit-xml=test_results_mpi3.xml armi/utils/tests/test_directoryChangersMpi.py > python -m pytest_verbose_mpi3.log - python doc/.static/cleanup_test_results.py test_results.xml + python3.13 -m pytest --junit-xml=test_results.xml -v -n 4 armi > pytest_verbose.log + mpiexec -n 2 --use-hwthread-cpus pytest --junit-xml=test_results_mpi1.xml armi/tests/test_mpiFeatures.py > python3.13 -m pytest_verbose_mpi1.log + mpiexec -n 2 --use-hwthread-cpus pytest --junit-xml=test_results_mpi2.xml armi/tests/test_mpiParameters.py > python3.13 -m pytest_verbose_mpi2.log + mpiexec -n 2 --use-hwthread-cpus pytest --junit-xml=test_results_mpi3.xml armi/utils/tests/test_directoryChangersMpi.py > python3.13 -m pytest_verbose_mpi3.log + python3.13 doc/.static/cleanup_test_results.py test_results.xml echo "Build HTML docs..." cd doc From 4155a77f43bcc8bcbaf6db94d59fe5bfcf5bc646 Mon Sep 17 00:00:00 2001 From: John Stilley <1831479+john-science@users.noreply.github.com> Date: Thu, 28 Aug 2025 13:04:56 -0700 Subject: [PATCH 08/36] installing pip in the dockerfile --- .github/workflows/docs_docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs_docker.yaml b/.github/workflows/docs_docker.yaml index 4679f5542d..07c811f01e 100644 --- a/.github/workflows/docs_docker.yaml +++ b/.github/workflows/docs_docker.yaml @@ -12,7 +12,7 @@ concurrency: jobs: build: - container: johnscience/armi:v2 + container: johnscience/armi:v3 # Building and deploying docs is broken on forked repos if: github.repository == 'terrapower/armi' From 2b826744c616c00cfbbf5354aa08032074846855 Mon Sep 17 00:00:00 2001 From: John Stilley <1831479+john-science@users.noreply.github.com> Date: Thu, 28 Aug 2025 13:15:38 -0700 Subject: [PATCH 09/36] We can't update pip? --- .github/workflows/docs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 664db5c2bb..9310c2858c 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -34,7 +34,7 @@ jobs: run: | echo "Installing ARMI..." set -x - pip install -U pip + #pip install -U pip pip install -e .[memprof,mpi,test,docs] echo "Run unit tests..." From 3a63327eb4233e0c469afa3513aecc10e8965534 Mon Sep 17 00:00:00 2001 From: John Stilley <1831479+john-science@users.noreply.github.com> Date: Thu, 28 Aug 2025 13:18:32 -0700 Subject: [PATCH 10/36] Not using pip update --- .github/workflows/docs_docker.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/docs_docker.yaml b/.github/workflows/docs_docker.yaml index 07c811f01e..3571c24d09 100644 --- a/.github/workflows/docs_docker.yaml +++ b/.github/workflows/docs_docker.yaml @@ -27,7 +27,6 @@ jobs: run: | echo "Installing ARMI..." set -x - python3.13 -m pip install -U pip python3.13 -m pip install -e .[memprof,mpi,test,docs] echo "Run unit tests..." From 46a9cffa8c7cab1c55fa72dd01df5b9cddc93f45 Mon Sep 17 00:00:00 2001 From: John Stilley <1831479+john-science@users.noreply.github.com> Date: Thu, 28 Aug 2025 13:28:02 -0700 Subject: [PATCH 11/36] Trying to get docker working - ownership troubles solution from here: https://github.com/actions/setup-python/issues/816#issuecomment-2100504677 --- .github/workflows/docs_docker.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/docs_docker.yaml b/.github/workflows/docs_docker.yaml index 3571c24d09..7db49d77cc 100644 --- a/.github/workflows/docs_docker.yaml +++ b/.github/workflows/docs_docker.yaml @@ -19,6 +19,8 @@ jobs: runs-on: ubuntu-22.04 steps: + - name: Change ownership of /github/home + run: sudo chown -R $(whoami) /github/home - name: Make html/pdf Docs continue-on-error: true env: From eb0bcbb69c47b1fceeef3990ecc5fcaea05d9b36 Mon Sep 17 00:00:00 2001 From: John Stilley <1831479+john-science@users.noreply.github.com> Date: Thu, 28 Aug 2025 13:30:50 -0700 Subject: [PATCH 12/36] can i do this without sudo? --- .github/workflows/docs_docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs_docker.yaml b/.github/workflows/docs_docker.yaml index 7db49d77cc..9ad5c05da8 100644 --- a/.github/workflows/docs_docker.yaml +++ b/.github/workflows/docs_docker.yaml @@ -20,7 +20,7 @@ jobs: steps: - name: Change ownership of /github/home - run: sudo chown -R $(whoami) /github/home + run: chown -R $(whoami) /github/home - name: Make html/pdf Docs continue-on-error: true env: From d634b15374f126d8245c2ea50bc6e8e8295b1039 Mon Sep 17 00:00:00 2001 From: John Stilley <1831479+john-science@users.noreply.github.com> Date: Thu, 28 Aug 2025 13:34:31 -0700 Subject: [PATCH 13/36] why won't it install? --- .github/workflows/docs_docker.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/docs_docker.yaml b/.github/workflows/docs_docker.yaml index 9ad5c05da8..e67bdb09f8 100644 --- a/.github/workflows/docs_docker.yaml +++ b/.github/workflows/docs_docker.yaml @@ -29,6 +29,8 @@ jobs: run: | echo "Installing ARMI..." set -x + pwd + ls python3.13 -m pip install -e .[memprof,mpi,test,docs] echo "Run unit tests..." From c6659108fc817dbd3305234b72b44da5e2761b8d Mon Sep 17 00:00:00 2001 From: John Stilley <1831479+john-science@users.noreply.github.com> Date: Thu, 28 Aug 2025 13:40:23 -0700 Subject: [PATCH 14/36] Update docs_docker.yaml --- .github/workflows/docs_docker.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/docs_docker.yaml b/.github/workflows/docs_docker.yaml index e67bdb09f8..82a28e61bd 100644 --- a/.github/workflows/docs_docker.yaml +++ b/.github/workflows/docs_docker.yaml @@ -29,8 +29,7 @@ jobs: run: | echo "Installing ARMI..." set -x - pwd - ls + cd armi python3.13 -m pip install -e .[memprof,mpi,test,docs] echo "Run unit tests..." From 180465cea67510b6e71f04e5c0a7ed5f78191400 Mon Sep 17 00:00:00 2001 From: John Stilley <1831479+john-science@users.noreply.github.com> Date: Thu, 28 Aug 2025 13:44:18 -0700 Subject: [PATCH 15/36] checking out repo --- .github/workflows/docs_docker.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docs_docker.yaml b/.github/workflows/docs_docker.yaml index 82a28e61bd..469b6dd860 100644 --- a/.github/workflows/docs_docker.yaml +++ b/.github/workflows/docs_docker.yaml @@ -12,15 +12,17 @@ concurrency: jobs: build: + runs-on: ubuntu-22.04 container: johnscience/armi:v3 # Building and deploying docs is broken on forked repos if: github.repository == 'terrapower/armi' - runs-on: ubuntu-22.04 steps: - name: Change ownership of /github/home run: chown -R $(whoami) /github/home + - name: Checkout repository + uses: actions/checkout@v2 - name: Make html/pdf Docs continue-on-error: true env: From ba9f654ab7bff882f4bf40a3985a2a564a262b66 Mon Sep 17 00:00:00 2001 From: John Stilley <1831479+john-science@users.noreply.github.com> Date: Thu, 28 Aug 2025 13:51:36 -0700 Subject: [PATCH 16/36] typo --- .github/workflows/docs_docker.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/docs_docker.yaml b/.github/workflows/docs_docker.yaml index 469b6dd860..384dea5176 100644 --- a/.github/workflows/docs_docker.yaml +++ b/.github/workflows/docs_docker.yaml @@ -31,7 +31,6 @@ jobs: run: | echo "Installing ARMI..." set -x - cd armi python3.13 -m pip install -e .[memprof,mpi,test,docs] echo "Run unit tests..." From f28ac84441e233a51e70fc736505120075ed0fb5 Mon Sep 17 00:00:00 2001 From: John Stilley <1831479+john-science@users.noreply.github.com> Date: Thu, 28 Aug 2025 13:55:14 -0700 Subject: [PATCH 17/36] upgrade pip --- .github/workflows/docs_docker.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docs_docker.yaml b/.github/workflows/docs_docker.yaml index 384dea5176..be4e568980 100644 --- a/.github/workflows/docs_docker.yaml +++ b/.github/workflows/docs_docker.yaml @@ -31,6 +31,7 @@ jobs: run: | echo "Installing ARMI..." set -x + python3.13 -m pip install -U pip python3.13 -m pip install -e .[memprof,mpi,test,docs] echo "Run unit tests..." From 532a3cec6dc0aae964c1bc31075effe307d19c04 Mon Sep 17 00:00:00 2001 From: John Stilley <1831479+john-science@users.noreply.github.com> Date: Thu, 28 Aug 2025 14:33:58 -0700 Subject: [PATCH 18/36] trying random stuff --- .github/workflows/docs_docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs_docker.yaml b/.github/workflows/docs_docker.yaml index be4e568980..144ade0d76 100644 --- a/.github/workflows/docs_docker.yaml +++ b/.github/workflows/docs_docker.yaml @@ -31,7 +31,7 @@ jobs: run: | echo "Installing ARMI..." set -x - python3.13 -m pip install -U pip + apt install --only-upgrade python3-pip python3.13 -m pip install -e .[memprof,mpi,test,docs] echo "Run unit tests..." From 1488193396909750a1aac4b58e9d882aa98bdf75 Mon Sep 17 00:00:00 2001 From: John Stilley <1831479+john-science@users.noreply.github.com> Date: Thu, 28 Aug 2025 14:39:55 -0700 Subject: [PATCH 19/36] we need setuptools? --- .github/workflows/docs_docker.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docs_docker.yaml b/.github/workflows/docs_docker.yaml index 144ade0d76..25231cb35f 100644 --- a/.github/workflows/docs_docker.yaml +++ b/.github/workflows/docs_docker.yaml @@ -32,6 +32,7 @@ jobs: echo "Installing ARMI..." set -x apt install --only-upgrade python3-pip + python3.13 -m pip install -U setuptools python3.13 -m pip install -e .[memprof,mpi,test,docs] echo "Run unit tests..." From 860eb05f09989729b0b146253c4a965dc676638a Mon Sep 17 00:00:00 2001 From: John Stilley <1831479+john-science@users.noreply.github.com> Date: Thu, 28 Aug 2025 16:30:21 -0700 Subject: [PATCH 20/36] TESTING pytest --- .github/workflows/docs_docker.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docs_docker.yaml b/.github/workflows/docs_docker.yaml index 25231cb35f..ddd61a8ef5 100644 --- a/.github/workflows/docs_docker.yaml +++ b/.github/workflows/docs_docker.yaml @@ -36,6 +36,7 @@ jobs: python3.13 -m pip install -e .[memprof,mpi,test,docs] echo "Run unit tests..." + python3.13 -m pytest armi/tests/test_runLog.py python3.13 -m pytest --junit-xml=test_results.xml -v -n 4 armi > pytest_verbose.log mpiexec -n 2 --use-hwthread-cpus pytest --junit-xml=test_results_mpi1.xml armi/tests/test_mpiFeatures.py > python3.13 -m pytest_verbose_mpi1.log mpiexec -n 2 --use-hwthread-cpus pytest --junit-xml=test_results_mpi2.xml armi/tests/test_mpiParameters.py > python3.13 -m pytest_verbose_mpi2.log From d1a7ee07fe831614962172a3efe59d7f532287fa Mon Sep 17 00:00:00 2001 From: John Stilley <1831479+john-science@users.noreply.github.com> Date: Thu, 28 Aug 2025 16:39:29 -0700 Subject: [PATCH 21/36] more pytest args --- .github/workflows/docs_docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs_docker.yaml b/.github/workflows/docs_docker.yaml index ddd61a8ef5..35f02742a5 100644 --- a/.github/workflows/docs_docker.yaml +++ b/.github/workflows/docs_docker.yaml @@ -36,7 +36,7 @@ jobs: python3.13 -m pip install -e .[memprof,mpi,test,docs] echo "Run unit tests..." - python3.13 -m pytest armi/tests/test_runLog.py + python3.13 -m pytest -v -n 4 armi/tests/test_runLog.py python3.13 -m pytest --junit-xml=test_results.xml -v -n 4 armi > pytest_verbose.log mpiexec -n 2 --use-hwthread-cpus pytest --junit-xml=test_results_mpi1.xml armi/tests/test_mpiFeatures.py > python3.13 -m pytest_verbose_mpi1.log mpiexec -n 2 --use-hwthread-cpus pytest --junit-xml=test_results_mpi2.xml armi/tests/test_mpiParameters.py > python3.13 -m pytest_verbose_mpi2.log From 1d2028c9ca2e484e0b7927d6025d457d272176f8 Mon Sep 17 00:00:00 2001 From: John Stilley <1831479+john-science@users.noreply.github.com> Date: Fri, 29 Aug 2025 11:16:26 -0700 Subject: [PATCH 22/36] Update docs_docker.yaml --- .github/workflows/docs_docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs_docker.yaml b/.github/workflows/docs_docker.yaml index 35f02742a5..afc17bce73 100644 --- a/.github/workflows/docs_docker.yaml +++ b/.github/workflows/docs_docker.yaml @@ -36,7 +36,7 @@ jobs: python3.13 -m pip install -e .[memprof,mpi,test,docs] echo "Run unit tests..." - python3.13 -m pytest -v -n 4 armi/tests/test_runLog.py + python3.13 -m pytest --junit-xml=test_results.xml -v -n 4 armi/tests/test_runLog.py python3.13 -m pytest --junit-xml=test_results.xml -v -n 4 armi > pytest_verbose.log mpiexec -n 2 --use-hwthread-cpus pytest --junit-xml=test_results_mpi1.xml armi/tests/test_mpiFeatures.py > python3.13 -m pytest_verbose_mpi1.log mpiexec -n 2 --use-hwthread-cpus pytest --junit-xml=test_results_mpi2.xml armi/tests/test_mpiParameters.py > python3.13 -m pytest_verbose_mpi2.log From f9fd8bae5975f5be130f2002d74c09b443c5ee47 Mon Sep 17 00:00:00 2001 From: John Stilley <1831479+john-science@users.noreply.github.com> Date: Fri, 29 Aug 2025 11:33:25 -0700 Subject: [PATCH 23/36] Is pipe the problem? --- .github/workflows/docs_docker.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docs_docker.yaml b/.github/workflows/docs_docker.yaml index afc17bce73..060a5dff1f 100644 --- a/.github/workflows/docs_docker.yaml +++ b/.github/workflows/docs_docker.yaml @@ -36,6 +36,7 @@ jobs: python3.13 -m pip install -e .[memprof,mpi,test,docs] echo "Run unit tests..." + ls > tmp.txt python3.13 -m pytest --junit-xml=test_results.xml -v -n 4 armi/tests/test_runLog.py python3.13 -m pytest --junit-xml=test_results.xml -v -n 4 armi > pytest_verbose.log mpiexec -n 2 --use-hwthread-cpus pytest --junit-xml=test_results_mpi1.xml armi/tests/test_mpiFeatures.py > python3.13 -m pytest_verbose_mpi1.log From cad1abfd7d0df740dfee352a2f691333f1aec543 Mon Sep 17 00:00:00 2001 From: John Stilley <1831479+john-science@users.noreply.github.com> Date: Fri, 29 Aug 2025 11:42:01 -0700 Subject: [PATCH 24/36] Is BASH redirect the problem? --- .github/workflows/docs_docker.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docs_docker.yaml b/.github/workflows/docs_docker.yaml index 060a5dff1f..385cdf0281 100644 --- a/.github/workflows/docs_docker.yaml +++ b/.github/workflows/docs_docker.yaml @@ -37,11 +37,13 @@ jobs: echo "Run unit tests..." ls > tmp.txt - python3.13 -m pytest --junit-xml=test_results.xml -v -n 4 armi/tests/test_runLog.py + cat tmp.txt + python3.13 -m pytest --junit-xml=test_results.xml -v -n 4 armi/tests/test_runLog.py > thing.txt + cat thing.txt python3.13 -m pytest --junit-xml=test_results.xml -v -n 4 armi > pytest_verbose.log - mpiexec -n 2 --use-hwthread-cpus pytest --junit-xml=test_results_mpi1.xml armi/tests/test_mpiFeatures.py > python3.13 -m pytest_verbose_mpi1.log - mpiexec -n 2 --use-hwthread-cpus pytest --junit-xml=test_results_mpi2.xml armi/tests/test_mpiParameters.py > python3.13 -m pytest_verbose_mpi2.log - mpiexec -n 2 --use-hwthread-cpus pytest --junit-xml=test_results_mpi3.xml armi/utils/tests/test_directoryChangersMpi.py > python3.13 -m pytest_verbose_mpi3.log + mpiexec -n 2 --use-hwthread-cpus python3.13 -m pytest --junit-xml=test_results_mpi1.xml armi/tests/test_mpiFeatures.py > pytest_verbose_mpi1.log + mpiexec -n 2 --use-hwthread-cpus python3.13 -m pytest --junit-xml=test_results_mpi2.xml armi/tests/test_mpiParameters.py > pytest_verbose_mpi2.log + mpiexec -n 2 --use-hwthread-cpus python3.13 -m pytest --junit-xml=test_results_mpi3.xml armi/utils/tests/test_directoryChangersMpi.py > pytest_verbose_mpi3.log python3.13 doc/.static/cleanup_test_results.py test_results.xml echo "Build HTML docs..." From 6d46d93512ceffb1f2587f938177dfbb5cddf532 Mon Sep 17 00:00:00 2001 From: John Stilley <1831479+john-science@users.noreply.github.com> Date: Fri, 29 Aug 2025 11:55:10 -0700 Subject: [PATCH 25/36] Maybe it's one test? --- .github/workflows/docs_docker.yaml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docs_docker.yaml b/.github/workflows/docs_docker.yaml index 385cdf0281..e577a7f863 100644 --- a/.github/workflows/docs_docker.yaml +++ b/.github/workflows/docs_docker.yaml @@ -15,6 +15,11 @@ jobs: runs-on: ubuntu-22.04 container: johnscience/armi:v3 + # python3.13 -m pytest --junit-xml=test_results.xml -v -n 4 armi > pytest_verbose.log + # mpiexec -n 2 --use-hwthread-cpus python3.13 -m pytest --junit-xml=test_results_mpi1.xml armi/tests/test_mpiFeatures.py > pytest_verbose_mpi1.log + # mpiexec -n 2 --use-hwthread-cpus python3.13 -m pytest --junit-xml=test_results_mpi2.xml armi/tests/test_mpiParameters.py > pytest_verbose_mpi2.log + # mpiexec -n 2 --use-hwthread-cpus python3.13 -m pytest --junit-xml=test_results_mpi3.xml armi/utils/tests/test_directoryChangersMpi.py > pytest_verbose_mpi3.log + # Building and deploying docs is broken on forked repos if: github.repository == 'terrapower/armi' @@ -36,14 +41,10 @@ jobs: python3.13 -m pip install -e .[memprof,mpi,test,docs] echo "Run unit tests..." - ls > tmp.txt - cat tmp.txt - python3.13 -m pytest --junit-xml=test_results.xml -v -n 4 armi/tests/test_runLog.py > thing.txt - cat thing.txt - python3.13 -m pytest --junit-xml=test_results.xml -v -n 4 armi > pytest_verbose.log - mpiexec -n 2 --use-hwthread-cpus python3.13 -m pytest --junit-xml=test_results_mpi1.xml armi/tests/test_mpiFeatures.py > pytest_verbose_mpi1.log - mpiexec -n 2 --use-hwthread-cpus python3.13 -m pytest --junit-xml=test_results_mpi2.xml armi/tests/test_mpiParameters.py > pytest_verbose_mpi2.log - mpiexec -n 2 --use-hwthread-cpus python3.13 -m pytest --junit-xml=test_results_mpi3.xml armi/utils/tests/test_directoryChangersMpi.py > pytest_verbose_mpi3.log + python3.13 -m pytest --junit-xml=test_results.xml -v -n 4 armi/tests/test_runLog.py > pytest_verbose.log + python3.13 -m pytest --junit-xml=test_results.xml -v -n 4 armi/tests/test_apps.py > pytest_verbose_mpi1.log + python3.13 -m pytest --junit-xml=test_results.xml -v -n 4 armi/tests/test_context.py > pytest_verbose_mpi2.log + python3.13 -m pytest --junit-xml=test_results.xml -v -n 4 armi/tests/test_plugins.py > pytest_verbose_mpi3.log python3.13 doc/.static/cleanup_test_results.py test_results.xml echo "Build HTML docs..." From b38388574be7334cb9fd6a3e901ee6b6312a6c5c Mon Sep 17 00:00:00 2001 From: John Stilley <1831479+john-science@users.noreply.github.com> Date: Fri, 29 Aug 2025 12:13:24 -0700 Subject: [PATCH 26/36] Cleanup --- .github/workflows/docs_docker.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/docs_docker.yaml b/.github/workflows/docs_docker.yaml index e577a7f863..0baec511ae 100644 --- a/.github/workflows/docs_docker.yaml +++ b/.github/workflows/docs_docker.yaml @@ -36,7 +36,6 @@ jobs: run: | echo "Installing ARMI..." set -x - apt install --only-upgrade python3-pip python3.13 -m pip install -U setuptools python3.13 -m pip install -e .[memprof,mpi,test,docs] From 99764030e25a33839aaa942afa9201df2f066eab Mon Sep 17 00:00:00 2001 From: John Stilley <1831479+john-science@users.noreply.github.com> Date: Fri, 29 Aug 2025 13:18:42 -0700 Subject: [PATCH 27/36] Trying a new container --- .github/workflows/docs_docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs_docker.yaml b/.github/workflows/docs_docker.yaml index 0baec511ae..8d65aa590d 100644 --- a/.github/workflows/docs_docker.yaml +++ b/.github/workflows/docs_docker.yaml @@ -13,7 +13,7 @@ concurrency: jobs: build: runs-on: ubuntu-22.04 - container: johnscience/armi:v3 + container: johnscience/armi:v5 # python3.13 -m pytest --junit-xml=test_results.xml -v -n 4 armi > pytest_verbose.log # mpiexec -n 2 --use-hwthread-cpus python3.13 -m pytest --junit-xml=test_results_mpi1.xml armi/tests/test_mpiFeatures.py > pytest_verbose_mpi1.log From 2c22b66254b480d0ba20fd2a05dbf43c0222113d Mon Sep 17 00:00:00 2001 From: John Stilley <1831479+john-science@users.noreply.github.com> Date: Fri, 29 Aug 2025 13:23:43 -0700 Subject: [PATCH 28/36] Permissions warfare --- .github/workflows/docs_docker.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docs_docker.yaml b/.github/workflows/docs_docker.yaml index 8d65aa590d..4213a0315a 100644 --- a/.github/workflows/docs_docker.yaml +++ b/.github/workflows/docs_docker.yaml @@ -25,7 +25,9 @@ jobs: steps: - name: Change ownership of /github/home - run: chown -R $(whoami) /github/home + run: | + chown -R $(whoami) /github/home + chown -R $(whoami) /armi - name: Checkout repository uses: actions/checkout@v2 - name: Make html/pdf Docs From 889cec0c439d80947483b2b79e5d80c810fa1376 Mon Sep 17 00:00:00 2001 From: John Stilley <1831479+john-science@users.noreply.github.com> Date: Fri, 29 Aug 2025 13:27:33 -0700 Subject: [PATCH 29/36] wrong dir name --- .github/workflows/docs_docker.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docs_docker.yaml b/.github/workflows/docs_docker.yaml index 4213a0315a..470ee6db1a 100644 --- a/.github/workflows/docs_docker.yaml +++ b/.github/workflows/docs_docker.yaml @@ -24,13 +24,13 @@ jobs: if: github.repository == 'terrapower/armi' steps: - - name: Change ownership of /github/home + - name: Change Ownership of Directories run: | chown -R $(whoami) /github/home - chown -R $(whoami) /armi + chown -R $(whoami) /__w/armi - name: Checkout repository uses: actions/checkout@v2 - - name: Make html/pdf Docs + - name: Make HTML/PDF Docs continue-on-error: true env: GH_TOKEN: ${{ github.token }} From 6f1715ccaaeaaed3b43ed38bd4e43705ffe3eacb Mon Sep 17 00:00:00 2001 From: John Stilley <1831479+john-science@users.noreply.github.com> Date: Fri, 29 Aug 2025 13:49:43 -0700 Subject: [PATCH 30/36] Try to get the GH CLI working inside docker --- .github/workflows/docs_docker.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/docs_docker.yaml b/.github/workflows/docs_docker.yaml index 470ee6db1a..db566ee9f8 100644 --- a/.github/workflows/docs_docker.yaml +++ b/.github/workflows/docs_docker.yaml @@ -30,6 +30,8 @@ jobs: chown -R $(whoami) /__w/armi - name: Checkout repository uses: actions/checkout@v2 + - name: Try to set up GitHub CLI + uses: actions4gh/setup-gh@v1 - name: Make HTML/PDF Docs continue-on-error: true env: @@ -49,6 +51,7 @@ jobs: python3.13 doc/.static/cleanup_test_results.py test_results.xml echo "Build HTML docs..." + apt-get install -y gh cd doc git submodule init git submodule update From 3a43661ad6b6a46e4d0d8d6f85b12e3c90db0b0e Mon Sep 17 00:00:00 2001 From: John Stilley <1831479+john-science@users.noreply.github.com> Date: Fri, 29 Aug 2025 13:57:05 -0700 Subject: [PATCH 31/36] Is the GH_TOKEN enough? --- .github/workflows/docs_docker.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/docs_docker.yaml b/.github/workflows/docs_docker.yaml index db566ee9f8..69ba59bd51 100644 --- a/.github/workflows/docs_docker.yaml +++ b/.github/workflows/docs_docker.yaml @@ -30,8 +30,6 @@ jobs: chown -R $(whoami) /__w/armi - name: Checkout repository uses: actions/checkout@v2 - - name: Try to set up GitHub CLI - uses: actions4gh/setup-gh@v1 - name: Make HTML/PDF Docs continue-on-error: true env: From f3e215835c709c1ec4142210c5246432425453ae Mon Sep 17 00:00:00 2001 From: John Stilley <1831479+john-science@users.noreply.github.com> Date: Fri, 29 Aug 2025 14:05:36 -0700 Subject: [PATCH 32/36] Are the pytest xmls being created? --- .github/workflows/docs.yaml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 9310c2858c..8cb0b4cf14 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -38,10 +38,15 @@ jobs: pip install -e .[memprof,mpi,test,docs] echo "Run unit tests..." - pytest --junit-xml=test_results.xml -v -n 4 armi > pytest_verbose.log - mpiexec -n 2 --use-hwthread-cpus pytest --junit-xml=test_results_mpi1.xml armi/tests/test_mpiFeatures.py > pytest_verbose_mpi1.log - mpiexec -n 2 --use-hwthread-cpus pytest --junit-xml=test_results_mpi2.xml armi/tests/test_mpiParameters.py > pytest_verbose_mpi2.log - mpiexec -n 2 --use-hwthread-cpus pytest --junit-xml=test_results_mpi3.xml armi/utils/tests/test_directoryChangersMpi.py > pytest_verbose_mpi3.log + pytest --junit-xml=/__w/armi/armi/test_results.xml -v -n 4 armi > pytest_verbose.log + echo "============================================================" + ls + ls > tmp.txt + cat tmp.txt + echo "============================================================" + mpiexec -n 2 --use-hwthread-cpus pytest --junit-xml=/__w/armi/armi/test_results_mpi1.xml armi/tests/test_mpiFeatures.py > pytest_verbose_mpi1.log + mpiexec -n 2 --use-hwthread-cpus pytest --junit-xml=/__w/armi/armi/test_results_mpi2.xml armi/tests/test_mpiParameters.py > pytest_verbose_mpi2.log + mpiexec -n 2 --use-hwthread-cpus pytest --junit-xml=/__w/armi/armi/test_results_mpi3.xml armi/utils/tests/test_directoryChangersMpi.py > pytest_verbose_mpi3.log python doc/.static/cleanup_test_results.py test_results.xml echo "Build HTML docs..." From 36657022aa01a2aaf54cffda769acb057a2bd242 Mon Sep 17 00:00:00 2001 From: John Stilley <1831479+john-science@users.noreply.github.com> Date: Fri, 29 Aug 2025 14:09:07 -0700 Subject: [PATCH 33/36] Update docs_docker.yaml --- .github/workflows/docs_docker.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/docs_docker.yaml b/.github/workflows/docs_docker.yaml index 69ba59bd51..c366ca30a7 100644 --- a/.github/workflows/docs_docker.yaml +++ b/.github/workflows/docs_docker.yaml @@ -43,6 +43,11 @@ jobs: echo "Run unit tests..." python3.13 -m pytest --junit-xml=test_results.xml -v -n 4 armi/tests/test_runLog.py > pytest_verbose.log + echo "============================================================" + ls + ls > tmp.txt + cat tmp.txt + echo "============================================================" python3.13 -m pytest --junit-xml=test_results.xml -v -n 4 armi/tests/test_apps.py > pytest_verbose_mpi1.log python3.13 -m pytest --junit-xml=test_results.xml -v -n 4 armi/tests/test_context.py > pytest_verbose_mpi2.log python3.13 -m pytest --junit-xml=test_results.xml -v -n 4 armi/tests/test_plugins.py > pytest_verbose_mpi3.log From ad34c96aff8477e7325d696abb0d6f61f8f51132 Mon Sep 17 00:00:00 2001 From: John Stilley <1831479+john-science@users.noreply.github.com> Date: Fri, 29 Aug 2025 14:17:02 -0700 Subject: [PATCH 34/36] print later --- .github/workflows/docs_docker.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docs_docker.yaml b/.github/workflows/docs_docker.yaml index c366ca30a7..4fd41dd414 100644 --- a/.github/workflows/docs_docker.yaml +++ b/.github/workflows/docs_docker.yaml @@ -43,14 +43,14 @@ jobs: echo "Run unit tests..." python3.13 -m pytest --junit-xml=test_results.xml -v -n 4 armi/tests/test_runLog.py > pytest_verbose.log + python3.13 -m pytest --junit-xml=test_results.xml -v -n 4 armi/tests/test_apps.py > pytest_verbose_mpi1.log + python3.13 -m pytest --junit-xml=test_results.xml -v -n 4 armi/tests/test_context.py > pytest_verbose_mpi2.log + python3.13 -m pytest --junit-xml=test_results.xml -v -n 4 armi/tests/test_plugins.py > pytest_verbose_mpi3.log echo "============================================================" ls ls > tmp.txt cat tmp.txt echo "============================================================" - python3.13 -m pytest --junit-xml=test_results.xml -v -n 4 armi/tests/test_apps.py > pytest_verbose_mpi1.log - python3.13 -m pytest --junit-xml=test_results.xml -v -n 4 armi/tests/test_context.py > pytest_verbose_mpi2.log - python3.13 -m pytest --junit-xml=test_results.xml -v -n 4 armi/tests/test_plugins.py > pytest_verbose_mpi3.log python3.13 doc/.static/cleanup_test_results.py test_results.xml echo "Build HTML docs..." From 4910e41763b6f45e1457ea68afc7d30ba2ad36a9 Mon Sep 17 00:00:00 2001 From: John Stilley <1831479+john-science@users.noreply.github.com> Date: Fri, 29 Aug 2025 14:29:25 -0700 Subject: [PATCH 35/36] lets look around --- .github/workflows/docs_docker.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docs_docker.yaml b/.github/workflows/docs_docker.yaml index 4fd41dd414..c529f02d76 100644 --- a/.github/workflows/docs_docker.yaml +++ b/.github/workflows/docs_docker.yaml @@ -48,8 +48,9 @@ jobs: python3.13 -m pytest --junit-xml=test_results.xml -v -n 4 armi/tests/test_plugins.py > pytest_verbose_mpi3.log echo "============================================================" ls - ls > tmp.txt - cat tmp.txt + pwd + ls .. + ls/ echo "============================================================" python3.13 doc/.static/cleanup_test_results.py test_results.xml From 8a3c909b557abcf552a892e3c72f786b0a44efa6 Mon Sep 17 00:00:00 2001 From: John Stilley <1831479+john-science@users.noreply.github.com> Date: Fri, 29 Aug 2025 16:18:11 -0700 Subject: [PATCH 36/36] typo in testing --- .github/workflows/docs_docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs_docker.yaml b/.github/workflows/docs_docker.yaml index c529f02d76..2433d04bed 100644 --- a/.github/workflows/docs_docker.yaml +++ b/.github/workflows/docs_docker.yaml @@ -50,7 +50,7 @@ jobs: ls pwd ls .. - ls/ + ls / echo "============================================================" python3.13 doc/.static/cleanup_test_results.py test_results.xml