From de0d60fe18bfa3a53bfa99973d86b0ba2deac973 Mon Sep 17 00:00:00 2001 From: Stefan Possanner Date: Wed, 21 Jan 2026 13:49:09 +0100 Subject: [PATCH 1/7] change to feectools, bump version to 0.1.2 --- .../actions/install/psydac-in-container/action.yml | 7 +++++-- .github/actions/install/psydac-req/action.yml | 2 ++ .../install/struphy-in-container/action.yml | 2 ++ pyproject.toml | 14 +++++--------- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.github/actions/install/psydac-in-container/action.yml b/.github/actions/install/psydac-in-container/action.yml index 3f3f4289e..814411455 100644 --- a/.github/actions/install/psydac-in-container/action.yml +++ b/.github/actions/install/psydac-in-container/action.yml @@ -1,5 +1,7 @@ name: Install Psydac in Container +description: + inputs: compile_language: required: true @@ -19,8 +21,9 @@ runs: run: | ls / -a which python3 - git clone https://github.com/struphy-hub/psydac-for-struphy.git - cd psydac-for-struphy + ls -a + git clone https://github.com/struphy-hub/feectools.git + cd feectools echo ${GIT_BRANCH_NAME} git checkout ${GIT_BRANCH_NAME} git pull diff --git a/.github/actions/install/psydac-req/action.yml b/.github/actions/install/psydac-req/action.yml index 535556663..74c79c108 100644 --- a/.github/actions/install/psydac-req/action.yml +++ b/.github/actions/install/psydac-req/action.yml @@ -1,5 +1,7 @@ name: Install prerequisites +description: + runs: using: composite steps: diff --git a/.github/actions/install/struphy-in-container/action.yml b/.github/actions/install/struphy-in-container/action.yml index d341f00a6..f97038b2a 100644 --- a/.github/actions/install/struphy-in-container/action.yml +++ b/.github/actions/install/struphy-in-container/action.yml @@ -1,5 +1,7 @@ name: Install Struphy in Container +description: + inputs: compile_language: required: true diff --git a/pyproject.toml b/pyproject.toml index 989d50e98..77fa163b7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "feectools" -version = "0.1.1" +version = "0.1.2" description = "Slimmed-down fork of Psydac (https://github.com/pyccel/psydac) with less functionality and fewer dependencies." readme = "README.md" requires-python = ">= 3.10" @@ -53,17 +53,13 @@ mpi = [ ] [project.urls] -Homepage = "https://github.com/struphy-hub/psydac-for-struphy" -Documentation = "https://github.com/struphy-hub/psydac-for-struphy" -Repository = "https://github.com/struphy-hub/psydac-for-struphy" +Homepage = "https://github.com/struphy-hub/feectools" +Documentation = "https://github.com/struphy-hub/feectools" +Repository = "https://github.com/struphy-hub/feectools" [project.scripts] psydac-mesh = "feectools.cmd.mesh:main" -psydac-accelerate = "feectools.accelerate.accelerate:main" -[tool.setuptools.packages.find] -include = ["feectools*"] -exclude = ["*__psydac__*"] -namespaces = false +psydac-accelerate = "feectools.accelerate.accelerate:main"q [tool.setuptools.package-data] "*" = ["*.txt"] From aed48bb8cc64b7fa4001e2b67e93464c1486bc1b Mon Sep 17 00:00:00 2001 From: Stefan Possanner Date: Wed, 21 Jan 2026 13:55:20 +0100 Subject: [PATCH 2/7] make dir for cloning feectools --- .github/actions/install/psydac-in-container/action.yml | 2 ++ pyproject.toml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/actions/install/psydac-in-container/action.yml b/.github/actions/install/psydac-in-container/action.yml index 814411455..cb19a3fb6 100644 --- a/.github/actions/install/psydac-in-container/action.yml +++ b/.github/actions/install/psydac-in-container/action.yml @@ -22,6 +22,8 @@ runs: ls / -a which python3 ls -a + mkdir for_cloning + cd for_cloning git clone https://github.com/struphy-hub/feectools.git cd feectools echo ${GIT_BRANCH_NAME} diff --git a/pyproject.toml b/pyproject.toml index 77fa163b7..81910591a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -59,7 +59,7 @@ Repository = "https://github.com/struphy-hub/feectools" [project.scripts] psydac-mesh = "feectools.cmd.mesh:main" -psydac-accelerate = "feectools.accelerate.accelerate:main"q +psydac-accelerate = "feectools.accelerate.accelerate:main" [tool.setuptools.package-data] "*" = ["*.txt"] From 7121b774920324d4023b25db07cb8add73e09d53 Mon Sep 17 00:00:00 2001 From: Stefan Possanner Date: Wed, 21 Jan 2026 14:08:59 +0100 Subject: [PATCH 3/7] avoid cached petsc --- .github/actions/install/psydac-req/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/install/psydac-req/action.yml b/.github/actions/install/psydac-req/action.yml index 74c79c108..c8db19bf7 100644 --- a/.github/actions/install/psydac-req/action.yml +++ b/.github/actions/install/psydac-req/action.yml @@ -92,7 +92,7 @@ runs: cache-name: cache-PETSc with: path: "./petsc" - key: petsc-${{ matrix.os }}-${{ matrix.python-version }} + key: petsc-${{ matrix.os }}-${{ matrix.python-version }}-xxxxx - if: steps.cache-petsc.outputs.cache-hit != 'true' name: Download a specific release of PETSc From 56904c1cdaeed1750540b37bc31cc6cb72952bdc Mon Sep 17 00:00:00 2001 From: Stefan Possanner Date: Wed, 21 Jan 2026 14:10:42 +0100 Subject: [PATCH 4/7] enable finding of package feectools --- pyproject.toml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 81910591a..80cef7ef3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -61,6 +61,11 @@ Repository = "https://github.com/struphy-hub/feectools" psydac-mesh = "feectools.cmd.mesh:main" psydac-accelerate = "feectools.accelerate.accelerate:main" +[tool.setuptools.packages.find] +include = ["feectools*"] +exclude = ["*__psydac__*"] +namespaces = false + [tool.setuptools.package-data] "*" = ["*.txt"] feectools = ['accelerate/compile_psydac.mk'] From cd40e4378de0a8b56177b07da0461d3d4aefb6b2 Mon Sep 17 00:00:00 2001 From: Stefan Possanner Date: Wed, 21 Jan 2026 14:17:56 +0100 Subject: [PATCH 5/7] re-enable petsc caching --- .github/actions/install/psydac-in-container/action.yml | 6 ++---- .github/actions/install/psydac-req/action.yml | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/actions/install/psydac-in-container/action.yml b/.github/actions/install/psydac-in-container/action.yml index cb19a3fb6..32484c9f0 100644 --- a/.github/actions/install/psydac-in-container/action.yml +++ b/.github/actions/install/psydac-in-container/action.yml @@ -22,10 +22,8 @@ runs: ls / -a which python3 ls -a - mkdir for_cloning - cd for_cloning - git clone https://github.com/struphy-hub/feectools.git - cd feectools + git clone https://github.com/struphy-hub/feectools.git feectools-tmp + cd feectools-tmp echo ${GIT_BRANCH_NAME} git checkout ${GIT_BRANCH_NAME} git pull diff --git a/.github/actions/install/psydac-req/action.yml b/.github/actions/install/psydac-req/action.yml index c8db19bf7..74c79c108 100644 --- a/.github/actions/install/psydac-req/action.yml +++ b/.github/actions/install/psydac-req/action.yml @@ -92,7 +92,7 @@ runs: cache-name: cache-PETSc with: path: "./petsc" - key: petsc-${{ matrix.os }}-${{ matrix.python-version }}-xxxxx + key: petsc-${{ matrix.os }}-${{ matrix.python-version }} - if: steps.cache-petsc.outputs.cache-hit != 'true' name: Download a specific release of PETSc From e38f04da7a9fe2673d9db4ca0097f65cf93081bf Mon Sep 17 00:00:00 2001 From: Stefan Possanner Date: Thu, 22 Jan 2026 08:54:24 +0100 Subject: [PATCH 6/7] remove --force-reinstall --no-cache-dir for psydac install --- .github/actions/install/psydac-in-container/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/install/psydac-in-container/action.yml b/.github/actions/install/psydac-in-container/action.yml index 32484c9f0..1f2108386 100644 --- a/.github/actions/install/psydac-in-container/action.yml +++ b/.github/actions/install/psydac-in-container/action.yml @@ -31,4 +31,4 @@ runs: pip show feectools psydac-accelerate --cleanup --yes pip uninstall feectools -y - python3 -m pip install . --force-reinstall --no-cache-dir \ No newline at end of file + python3 -m pip install . \ No newline at end of file From 9d0d7d6fbec1e967a50f15d9d1847c950b4b6ad5 Mon Sep 17 00:00:00 2001 From: Stefan Possanner Date: Thu, 22 Jan 2026 09:22:47 +0100 Subject: [PATCH 7/7] re-install petsc only if cache-hit is an empty string --- .github/actions/install/psydac-req/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/install/psydac-req/action.yml b/.github/actions/install/psydac-req/action.yml index 74c79c108..938c5e95e 100644 --- a/.github/actions/install/psydac-req/action.yml +++ b/.github/actions/install/psydac-req/action.yml @@ -94,13 +94,13 @@ runs: path: "./petsc" key: petsc-${{ matrix.os }}-${{ matrix.python-version }} - - if: steps.cache-petsc.outputs.cache-hit != 'true' + - if: steps.cache-petsc.outputs.cache-hit == '' name: Download a specific release of PETSc shell: bash run: | git clone --depth 1 --branch v3.23.3 https://gitlab.com/petsc/petsc.git - - if: steps.cache-petsc.outputs.cache-hit != 'true' + - if: steps.cache-petsc.outputs.cache-hit == '' name: Install PETSc with complex support working-directory: ./petsc shell: bash