Skip to content

Commit

Permalink
Fixes
Browse files Browse the repository at this point in the history
* Fix package data by enabling setuptools-scm
* Install more build dependencies for Thetis
  • Loading branch information
connorjward committed Feb 20, 2025
1 parent 067f60c commit 53ac297
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion docker/Dockerfile.firedrake
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ RUN if [ "$INSTALL_NGSPETSC" = 1 ]; then \
# Install Firedrake apps
# TODO: Some downstream packages do not specify build dependencies correctly
# so they must be installed here
RUN pip install --break-system-packages --verbose setuptools; \
RUN pip install --break-system-packages --verbose setuptools versioneer; \
pip install --break-system-packages --verbose --src . \
-e git+https://github.com/firedrakeproject/asQ.git#egg=asQ \
-e git+https://bitbucket.org/pefarrell/defcon.git#egg=defon \
Expand Down
7 changes: 6 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@ test = [
[build-system]
requires = [
"setuptools>61.2",
"setuptools_scm>=8", # automatically put git tracked files into the sdist
# install all git-tracked files (otherwise non-Python files are ignored)
"setuptools_scm>=8",
"Cython>=3.0",
"pybind11",
"pkgconfig",
Expand All @@ -118,3 +119,7 @@ script-files = [
"firedrake/scripts/firedrake-zenodo",
"scripts/firedrake-run-split-tests",
]

[tool.setuptools_scm]
# Need this empty section to enable setuptools-scm
# (https://setuptools-scm.readthedocs.io/en/latest/usage/)

0 comments on commit 53ac297

Please sign in to comment.