From 8a8de1f21613a534e59bdd6698000a24cce5cf93 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Mon, 12 Aug 2024 10:03:15 -0700 Subject: [PATCH] Update CI & Requirements Files --- .github/workflows/dependencies/clang-san-openmpi.sh | 4 +++- .github/workflows/dependencies/clang-tidy.sh | 4 +++- .github/workflows/dependencies/gcc-openmpi.sh | 4 +++- .github/workflows/dependencies/gcc.sh | 4 +++- .github/workflows/macos.yml | 5 +++-- .github/workflows/stubs.yml | 5 ----- tests/python/requirements.txt | 1 + 7 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.github/workflows/dependencies/clang-san-openmpi.sh b/.github/workflows/dependencies/clang-san-openmpi.sh index e4d699bed..51322a8d5 100755 --- a/.github/workflows/dependencies/clang-san-openmpi.sh +++ b/.github/workflows/dependencies/clang-san-openmpi.sh @@ -30,9 +30,11 @@ sudo apt-get install -y \ python3 -m pip install -U pip python3 -m pip install -U build packaging setuptools wheel -python3 -m pip install -U cmake pytest +python3 -m pip install -U cmake python3 -m pip install -U -r requirements_mpi.txt +python3 -m pip install -U -r src/python/impactx/dashboard/requirements.txt python3 -m pip install -U -r examples/requirements.txt +python3 -m pip install -U -r tests/python/requirements.txt # cmake-easyinstall # diff --git a/.github/workflows/dependencies/clang-tidy.sh b/.github/workflows/dependencies/clang-tidy.sh index 134f3a7a7..b4695e4d8 100755 --- a/.github/workflows/dependencies/clang-tidy.sh +++ b/.github/workflows/dependencies/clang-tidy.sh @@ -29,9 +29,11 @@ sudo apt-get install -y \ python3 -m pip install -U pip python3 -m pip install -U build packaging setuptools wheel -python3 -m pip install -U cmake pytest +python3 -m pip install -U cmake python3 -m pip install -U -r requirements_mpi.txt +python3 -m pip install -U -r src/python/impactx/dashboard/requirements.txt python3 -m pip install -U -r examples/requirements.txt +python3 -m pip install -U -r tests/python/requirements.txt # cmake-easyinstall # diff --git a/.github/workflows/dependencies/gcc-openmpi.sh b/.github/workflows/dependencies/gcc-openmpi.sh index ee5159d44..a53e8395c 100755 --- a/.github/workflows/dependencies/gcc-openmpi.sh +++ b/.github/workflows/dependencies/gcc-openmpi.sh @@ -26,8 +26,10 @@ sudo apt-get install -y \ python3 -m pip install -U pip python3 -m pip install -U build packaging setuptools wheel -python3 -m pip install -U cmake pytest +python3 -m pip install -U cmake python3 -m pip install -U -r requirements_mpi.txt +python3 -m pip install -U -r src/python/impactx/dashboard/requirements.txt python3 -m pip install -U -r examples/requirements.txt +python3 -m pip install -U -r tests/python/requirements.txt python3 -m pip install -U openPMD-validator diff --git a/.github/workflows/dependencies/gcc.sh b/.github/workflows/dependencies/gcc.sh index 1eb2882a0..c39caa33a 100755 --- a/.github/workflows/dependencies/gcc.sh +++ b/.github/workflows/dependencies/gcc.sh @@ -24,8 +24,10 @@ sudo apt-get install -y \ python3 -m pip install -U pip python3 -m pip install -U build packaging setuptools wheel -python3 -m pip install -U cmake pytest +python3 -m pip install -U cmake python3 -m pip install -U -r requirements.txt +python3 -m pip install -U -r src/python/impactx/dashboard/requirements.txt python3 -m pip install -U -r examples/requirements.txt +python3 -m pip install -U -r tests/python/requirements.txt python3 -m pip install -U openPMD-validator diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index f1d3a639a..fc22071fc 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -39,10 +39,11 @@ jobs: python3 -m venv py-venv source py-venv/bin/activate python3 -m pip install --upgrade pip - python3 -m pip install --upgrade build packaging setuptools wheel pytest - python3 -m pip install --upgrade pytest seleniumbase + python3 -m pip install --upgrade build packaging setuptools wheel python3 -m pip install --upgrade -r requirements_mpi.txt + python3 -m pip install --upgrade -r src/python/impactx/dashboard/requirements.txt python3 -m pip install --upgrade -r examples/requirements.txt + python3 -m pip install --upgrade -r tests/python/requirements.txt set -e python3 -m pip install --upgrade pipx python3 -m pipx install openPMD-validator diff --git a/.github/workflows/stubs.yml b/.github/workflows/stubs.yml index 4acd97ef4..dff96e937 100644 --- a/.github/workflows/stubs.yml +++ b/.github/workflows/stubs.yml @@ -41,10 +41,6 @@ jobs: python3 -m pip install -U pip setuptools wheel python3 -m pip install -U pip mpi4py pytest pybind11-stubgen pre-commit seleniumbase - - name: Dashboard Dependencies - run: | - python3 -m pip install -U matplotlib plotly trame trame-matplotlib trame-plotly trame-router trame-xterm trame-vuetify - - name: Set Up Cache uses: actions/cache@v4 with: @@ -88,7 +84,6 @@ jobs: run: | mpiexec -np 1 python3 -m pytest tests/python/ - - uses: stefanzweifel/git-auto-commit-action@v5 name: Commit Updated Stub Files if: github.event_name == 'push' && github.repository == 'ECP-WarpX/impactx' && github.ref == 'refs/heads/development' diff --git a/tests/python/requirements.txt b/tests/python/requirements.txt index 1052c9366..318cac888 100644 --- a/tests/python/requirements.txt +++ b/tests/python/requirements.txt @@ -1,2 +1,3 @@ -r ../../examples/requirements.txt pytest +seleniumbase