Skip to content

Commit

Permalink
Try using Transonic 0.6.0rc0
Browse files Browse the repository at this point in the history
  • Loading branch information
paugier committed Jan 16, 2024
1 parent 340abbb commit 30e55d1
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ pixi-test:
optional: true
script:
- pixi info
- rm -rf ../transonic
- hg clone https://foss.heptapod.net/fluiddyn/transonic ../transonic
# - rm -rf ../transonic
# - hg clone https://foss.heptapod.net/fluiddyn/transonic ../transonic
- pixi run install-editable
- pixi run pytest -v lib
- pixi run fluidsim-test -v
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ SHELL := bash
RELEASE=$(shell hg tags -T "{node|short}\n" | sed -n 2p)
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
.PHONY: black black_check clean clean_pyc clean_so cleantransonic coverage_short develop dist lint _report_coverage shortlog tests _tests_coverage tests_mpi

develop:
pdm sync --clean --no-self
Expand Down
13 changes: 7 additions & 6 deletions pdm.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ platforms = ["linux-64"]

[tasks]
# use as `pixi run install-editable`
install-dependencies = "pixi install && pip install -e ./lib && pip install ../transonic"
# install-dependencies = "pixi install && pip install -e ./lib && pip install ../transonic"
install-dependencies = "pixi install && pip install -e ./lib && pip install transonic==0.6.0rc0"
install-editable = {cmd = "pip install -e . -v --no-build-isolation --no-deps", depends_on = ["install-dependencies"]}

[dependencies]
Expand Down
8 changes: 5 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
requires = [
"meson-python",
"numpy",
"transonic@hg+https://foss.heptapod.net/fluiddyn/transonic",
# "transonic@hg+https://foss.heptapod.net/fluiddyn/transonic",
"transonic>=0.6.0rc0",
"pythran>=0.9.7",
]
build-backend = 'mesonpy'
Expand All @@ -23,7 +24,7 @@ dependencies = [
"fluidsim-core>=0.7.4",
"h5py",
"h5netcdf",
"transonic",
"transonic>=0.6.0rc0",
"xarray",
"rich",
"matplotlib>=3.3",
Expand Down Expand Up @@ -138,7 +139,8 @@ setup = ['-Doptimization=3']
build = [
"meson-python",
"numpy",
"transonic@hg+https://foss.heptapod.net/fluiddyn/transonic@default",
# "transonic@hg+https://foss.heptapod.net/fluiddyn/transonic@default",
"transonic>=0.6.0rc0",
"pythran>=0.9.7",
"ninja",
]
Expand Down

0 comments on commit 30e55d1

Please sign in to comment.