Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/workflows/ccpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,7 @@ jobs:
python-version: "3.12"

- name: Install Python build dependencies
run: |
pip -v install --upgrade -r python/build-requirements.txt
run: python -m scikit_build_core.build requires | python -c "import sys, json; print(', '.join(json.load(sys.stdin)))" | xargs pip install

- name: Install FEniCS Python components
run: |
Expand Down Expand Up @@ -187,7 +186,7 @@ jobs:
run: cat .github/workflows/fenicsx-refs.env >> $GITHUB_ENV

- name: Install Python build dependencies
run: pip install -r python/build-requirements.txt
run: python -m scikit_build_core.build requires | python -c "import sys, json; print(', '.join(json.load(sys.stdin)))" | xargs pip install

- name: Install FEniCS Python components
run: |
Expand Down Expand Up @@ -294,7 +293,7 @@ jobs:

- name: Install FEniCS Python components
run: |
pip install -r python/build-requirements.txt
run: python -m scikit_build_core.build requires | python -c "import sys, json; print(', '.join(json.load(sys.stdin)))" | xargs pip install
pip install --no-build-isolation git+https://github.com/${{ env.ufl_repository }}.git@${{ env.ufl_ref }}
pip install --no-build-isolation git+https://github.com/${{ env.basix_repository }}.git@${{ env.basix_ref }}
pip install --no-build-isolation git+https://github.com/${{ env.ffcx_repository }}.git@${{ env.ffcx_ref }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clang-tidy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
run: |
apt-get update
apt-get install -y clang-tidy catch2
pip install -r python/build-requirements.txt
python -m scikit_build_core.build requires | python -c "import sys, json; print(', '.join(json.load(sys.stdin)))" | xargs pip install

- name: Load environment variables
run: cat .github/workflows/fenicsx-refs.env >> $GITHUB_ENV
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ jobs:

- name: Build and install DOLFINx Python interface
run: |
pip install -r python/build-requirements.txt
python -m scikit_build_core.build requires | python -c "import sys, json; print(', '.join(json.load(sys.stdin)))" | xargs pip install
pip install --check-build-dependencies --no-build-isolation 'python/[test]'

- name: Basic test
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,7 @@ jobs:

- name: Install DOLFINx Python build dependencies
working-directory: dolfinx-src/python
run: |
pip -v install --no-binary mpi4py -r build-requirements.txt
run: python -m scikit_build_core.build requires | python -c "import sys, json; print(', '.join(json.load(sys.stdin)))" | xargs pip install

- name: Install DOLFINx (Python)
working-directory: dolfinx-src/python
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ To install the Python interface, first install the C++ core, and then in
the `python/` directory run:

```shell
pip install -r build-requirements.txt
python -m scikit_build_core.build requires | python -c "import sys, json; print(', '.join(json.load(sys.stdin)))" | xargs pip install
pip install --check-build-dependencies --no-build-isolation .
```

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.end-user
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ ONBUILD ARG DOLFINX_CMAKE_BUILD_TYPE="Release"
# Using pip install `.[test]` with --no-dependencies and --no-build-isolation
# does not install necessary packages, hence install build and optional
# dependencies manually here.
ONBUILD RUN pip install --no-cache-dir -r dolfinx/python/build-requirements.txt && \
ONBUILD RUN python -m scikit_build_core.build requires | python -c "import sys, json; print(', '.join(json.load(sys.stdin)))" | xargs pip install && \
pip install --no-cache-dir pyamg pytest scipy matplotlib numba # test + optional set

# The dolfinx-onbuild container expects to have folders basix/ ufl/
Expand Down
2 changes: 1 addition & 1 deletion python/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Below is guidance for building the DOLFINx Python interface.

2. Ensure the Python interface build requirements are installed:

pip install -r build-requirements.txt
python -m scikit_build_core.build requires | python -c "import sys, json; print(', '.join(json.load(sys.stdin)))" | xargs pip install

3. Build DOLFINx Python interface:

Expand Down
4 changes: 0 additions & 4 deletions python/build-requirements.txt

This file was deleted.

2 changes: 1 addition & 1 deletion python/doc/source/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ Python
After installation of the C++ interface, from the ``python/`` directory
the Python interface can be installed using::

pip install -r build-requirements.txt
python -m scikit_build_core.build requires | python -c "import sys, json; print(', '.join(json.load(sys.stdin)))" | xargs pip install
pip install --check-build-dependencies --no-build-isolation .


Expand Down
1 change: 0 additions & 1 deletion python/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
# system built petsc4py and mpi4py.
# NOTE: petsc4py is an optional build dependency, therefore we don't
# list it here.
# pip install -r build-requirements.txt
[build-system]
requires = ["scikit-build-core[pyproject]>=0.10", "nanobind>=2.5.0", "mpi4py"]
build-backend = "scikit_build_core.build"
Expand Down
Loading