Skip to content

Commit 7c5bdbc

Browse files
authored
change to feectools, bump version to 0.1.2 (#63)
* change to feectools, bump version to 0.1.2 * make dir for cloning feectools * avoid cached petsc * enable finding of package feectools * re-enable petsc caching * remove --force-reinstall --no-cache-dir for psydac install * re-install petsc only if cache-hit is an empty string
1 parent ae64164 commit 7c5bdbc

4 files changed

Lines changed: 17 additions & 9 deletions

File tree

.github/actions/install/psydac-in-container/action.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
name: Install Psydac in Container
22

3+
description:
4+
35
inputs:
46
compile_language:
57
required: true
@@ -19,13 +21,14 @@ runs:
1921
run: |
2022
ls / -a
2123
which python3
22-
git clone https://github.com/struphy-hub/psydac-for-struphy.git
23-
cd psydac-for-struphy
24+
ls -a
25+
git clone https://github.com/struphy-hub/feectools.git feectools-tmp
26+
cd feectools-tmp
2427
echo ${GIT_BRANCH_NAME}
2528
git checkout ${GIT_BRANCH_NAME}
2629
git pull
2730
source /struphy_${{ inputs.compile_language }}_/env_${{ inputs.compile_language }}_/bin/activate
2831
pip show feectools
2932
psydac-accelerate --cleanup --yes
3033
pip uninstall feectools -y
31-
python3 -m pip install . --force-reinstall --no-cache-dir
34+
python3 -m pip install .

.github/actions/install/psydac-req/action.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
name: Install prerequisites
22

3+
description:
4+
35
runs:
46
using: composite
57
steps:
@@ -92,13 +94,13 @@ runs:
9294
path: "./petsc"
9395
key: petsc-${{ matrix.os }}-${{ matrix.python-version }}
9496

95-
- if: steps.cache-petsc.outputs.cache-hit != 'true'
97+
- if: steps.cache-petsc.outputs.cache-hit == ''
9698
name: Download a specific release of PETSc
9799
shell: bash
98100
run: |
99101
git clone --depth 1 --branch v3.23.3 https://gitlab.com/petsc/petsc.git
100102
101-
- if: steps.cache-petsc.outputs.cache-hit != 'true'
103+
- if: steps.cache-petsc.outputs.cache-hit == ''
102104
name: Install PETSc with complex support
103105
working-directory: ./petsc
104106
shell: bash

.github/actions/install/struphy-in-container/action.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
name: Install Struphy in Container
22

3+
description:
4+
35
inputs:
46
compile_language:
57
required: true

pyproject.toml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
44

55
[project]
66
name = "feectools"
7-
version = "0.1.1"
7+
version = "0.1.2"
88
description = "Slimmed-down fork of Psydac (https://github.com/pyccel/psydac) with less functionality and fewer dependencies."
99
readme = "README.md"
1010
requires-python = ">= 3.10"
@@ -53,13 +53,14 @@ mpi = [
5353
]
5454

5555
[project.urls]
56-
Homepage = "https://github.com/struphy-hub/psydac-for-struphy"
57-
Documentation = "https://github.com/struphy-hub/psydac-for-struphy"
58-
Repository = "https://github.com/struphy-hub/psydac-for-struphy"
56+
Homepage = "https://github.com/struphy-hub/feectools"
57+
Documentation = "https://github.com/struphy-hub/feectools"
58+
Repository = "https://github.com/struphy-hub/feectools"
5959

6060
[project.scripts]
6161
psydac-mesh = "feectools.cmd.mesh:main"
6262
psydac-accelerate = "feectools.accelerate.accelerate:main"
63+
6364
[tool.setuptools.packages.find]
6465
include = ["feectools*"]
6566
exclude = ["*__psydac__*"]

0 commit comments

Comments
 (0)