Skip to content

Commit 205b61e

Browse files
authored
Fix pftools install, was not installing python module correctly (parflow#628)
Previous Python package fix was not pip installing pftools correclty.
1 parent 05bfeb2 commit 205b61e

4 files changed

Lines changed: 9 additions & 6 deletions

File tree

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ RUN mkdir -p build && \
133133
-DHYPRE_ROOT=$PARFLOW_DIR \
134134
-DSILO_ROOT=$PARFLOW_DIR \
135135
-DPARFLOW_ENABLE_HDF5=TRUE \
136-
-DPARFLOW_ENABLE_NETCDF=TRUE \
136+
-DNETCDF_DIR=$PARFLOW_DEP_DIR -DNETCDF_Fortran_ROOT=$PARFLOW_DEP_DIR \
137137
-DPARFLOW_ENABLE_TIMING=TRUE \
138138
-DPARFLOW_HAVE_CLM=TRUE \
139139
-DPARFLOW_ENABLE_PYTHON=TRUE \

docs/manuals/release_process.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ Example using podman to build and push
7575

7676
```shell
7777
VERSION=3.13.0
78-
podman build -t docker.io/parflow/parflow:version-$(VERSION) .
78+
podman build -t docker.io/parflow/parflow:version-${VERSION} .
7979
podman login docker.io
80-
podman push docker.io/parflow/parflow:version-$(VERSION)
81-
podman tag docker.io/parflow/parflow:version-$(VERSION) docker.io/parflow/parflow:latest
80+
podman push docker.io/parflow/parflow:version-${VERSION}
81+
podman tag docker.io/parflow/parflow:version-${VERSION} docker.io/parflow/parflow:latest
8282
podman push docker.io/parflow/parflow:latest
8383
```
8484

pftools/python/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ install(
8686
"bin"
8787
)
8888

89-
install(CODE "execute_process(COMMAND ${CMAKE_INSTALL_PREFIX}/py-env/bin/pip3 install --use-pep517 ${CMAKE_INSTALL_PREFIX}/python)" )
89+
install(CODE "execute_process(COMMAND ${CMAKE_INSTALL_PREFIX}/py-env/bin/pip3 install ${CMAKE_INSTALL_PREFIX}/python)" )
9090

9191
add_custom_target(
9292
pf-python ALL

pftools/python/pyproject.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,11 @@ Documentation = "https://parflow.readthedocs.io/en/latest/"
5050
[project.entry-points."xarray.backends"]
5151
parflow = "parflow.tools.pf_backend:ParflowBackendEntrypoint"
5252

53+
[tool.setuptools.packages.find]
54+
where = ["."]
55+
include = ["*"]
56+
5357
[tool.setuptools]
54-
packages = ["parflow"]
5558
include-package-data = true
5659

5760
[tool.setuptools.package-data]

0 commit comments

Comments
 (0)