Skip to content

Commit

Permalink
Pages + --no-deps
Browse files Browse the repository at this point in the history
  • Loading branch information
paugier committed Jan 6, 2024
1 parent 2baf1eb commit c393709
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ report_coverage:
- coverage report


doc:build:
pages:
stage: doc
needs:
- job: "CI image"
Expand All @@ -122,7 +122,7 @@ doc:build:
- . .venv/bin/activate
- pip install fluidfft
- pdm install -G doc -G fft -G test --no-self
- pip install . --config-settings=setup-args=-Dtransonic-backend=python
- pip install . --config-settings=setup-args=-Dtransonic-backend=python --no-deps
- pdm run xvfb-run --auto-servernum sphinx-build -b html -d doc/_build/doctrees doc doc/_build/html
- mkdir -p public/$CI_COMMIT_REF_NAME
- rsync -rvc --delete doc/_build/html/* public/$CI_COMMIT_REF_NAME/
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ MPI_NUM_PROCS ?= 2

develop:
pdm install --no-self
pdm run pip install -e . --no-build-isolation
pdm run pip install -e . --no-build-isolation --no-deps

dist:
pip install build
Expand Down
15 changes: 12 additions & 3 deletions doc/build-from-source.md
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ users.
##### Install PDM

A first step is to install [PDM] as an external independant application. I (Pierre
Augier) usually use \[pipx\] for that but
Augier) usually use [pipx] for that but
[there are other methods](https://pdm-project.org/latest/#installation).

```sh
Expand All @@ -173,11 +173,19 @@ pipx install pdm -U
Installing in editable mode is a bit particular with Meson, since all build
dependencies have to be installed in the main virtual environment, i.e. editable
installations are incompatible with isolated builds! Fortunatelly, it's not too
difficult with [PDM]:
difficult with [PDM]. From the root directory of the repository, just run:

```sh
pdm install --no-self
pdm run pip install -e . --no-build-isolation
```

This last command creates a virtual environment and install all build and runtime
dependencies. You can then activate this environment and build/install Fluidsim
with:

```sh
. .venv/bin/activate
pip install -e . --no-build-isolation --no-deps
```

### Python installed with conda/mamba/conda-forge
Expand Down Expand Up @@ -229,6 +237,7 @@ https://meson-python.readthedocs.io/en/latest/how-to-guides/editable-installs.ht
[nox]: https://nox.thea.codes
[pdm]: https://pdm-project.org
[pip]: https://pip.pypa.io
[pipx]: https://github.com/pypa/pipx
[pytest]: https://docs.pytest.org
[pythran]: https://pythran.readthedocs.io
[transonic]: https://transonic.readthedocs.io
4 changes: 2 additions & 2 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def validate_code(session):
def test_without_fft_and_pythran(session):
command = "pdm install -G dev -G test -G mpi -G scipy --no-self"
session.run_always(*command.split(), external=True)
session.install(".", "--config-settings=setup-args=-Dtransonic-backend=python")
session.install(".", "--config-settings=setup-args=-Dtransonic-backend=python", "--no-deps")
session.run(
"make",
"_tests_coverage",
Expand All @@ -30,6 +30,6 @@ def test_with_fft_and_pythran(session):

command = "pdm install -G dev -G test -G fft -G mpi -G scipy --no-self"
session.run_always(*command.split(), external=True)
session.install(".")
session.install(".", "--no-deps")

session.run("make", "_tests_coverage", external=True)

0 comments on commit c393709

Please sign in to comment.