Skip to content

Commit

Permalink
Merge branch 'topic/default/pdm-lock-check-transonic' into 'branch/de…
Browse files Browse the repository at this point in the history
…fault'

Check Fluidsim CI with new Transonic

See merge request fluiddyn/fluidsim!361
  • Loading branch information
paugier committed Jan 16, 2024
2 parents 3de301e + 15cfd1f commit 340abbb
Show file tree
Hide file tree
Showing 6 changed files with 169 additions and 250 deletions.
60 changes: 0 additions & 60 deletions .appveyor.yml

This file was deleted.

2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ MPI_NUM_PROCS ?= 2
.PHONY: black black_check clean clean_pyc clean_so cleantransonic coverage_short develop develop_lib develop_user dist lint _report_coverage shortlog tests _tests_coverage tests_mpi

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

dist:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[![Chat room](https://img.shields.io/matrix/fluiddyn-users:matrix.org.svg)](https://matrix.to/#/#fluiddyn-users:matrix.org)
[![Code coverage](https://codecov.io/gh/fluiddyn/fluidsim/branch/branch%2Fdefault/graph/badge.svg)](https://codecov.io/gh/fluiddyn/fluidsim)
[![Heptapod CI](https://foss.heptapod.net/fluiddyn/fluidsim/badges/branch/default/pipeline.svg)](https://foss.heptapod.net/fluiddyn/fluidsim/-/pipelines)
[![Github Actions](https://github.com/fluiddyn/fluidsim/actions/workflows/ci.yml/badge.svg?branch=branch/default)](https://github.com/fluiddyn/fluidsim/actions)
[![Github Actions](https://github.com/fluiddyn/fluidsim/actions/workflows/ci-linux.yml/badge.svg?branch=branch/default)](https://github.com/fluiddyn/fluidsim/actions)

Fluidsim is an extensible framework for studying fluid dynamics with numerical
simulations using Python. Fluidsim is an object-oriented library to develop
Expand Down
9 changes: 0 additions & 9 deletions environment.yml

This file was deleted.

9 changes: 6 additions & 3 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,20 @@
import nox

os.environ.update({"PDM_IGNORE_SAVED_PYTHON": "1"})
nox.options.reuse_existing_virtualenvs = 1


@nox.session
def validate_code(session):
session.run_always("pdm", "install", "-G", "dev", "--no-self", external=True)
session.run_always(
"pdm", "sync", "--clean", "-G", "dev", "--no-self", external=True
)
session.run("pdm", "validate_code", external=True)


@nox.session
def test_without_fft_and_pythran(session):
command = "pdm install -G dev -G test -G mpi --no-self"
command = "pdm sync --clean -G dev -G test -G mpi --no-self"
session.run_always(*command.split(), external=True)
session.install(
".", "--config-settings=setup-args=-Dtransonic-backend=python", "--no-deps"
Expand All @@ -31,7 +34,7 @@ def test_with_fft_and_pythran(session):
# first install fluidfft without Pythran compilation
session.install("fluidfft", env={"FLUIDFFT_TRANSONIC_BACKEND": "python"})

command = "pdm install -G dev -G test -G fft -G mpi --no-self"
command = "pdm sync --clean -G dev -G test -G fft -G mpi --no-self"
session.run_always(*command.split(), external=True)
session.install(".", "--no-deps", "-C", "setup-args=-Dnative=true")

Expand Down
Loading

0 comments on commit 340abbb

Please sign in to comment.