Merge branch 'topic/default/misc' into 'branch/default'

Misc: lock and venv

See merge request fluiddyn/fluidimage!129

Author: paugier

.hgignore

@@ -14,7 +14,7 @@ fluidimage/_hg_rev.py
 .venv
 .nox
 .pixi
-
+.python-version
 .pdm-python
 
 *.swp

CHANGES.md

@@ -1,7 +1,15 @@
 # Release notes
 
 See also the
-[unreleased changes](https://foss.heptapod.net/fluiddyn/fluidimage/-/compare/0.5.3...branch%2Fdefault).
+[unreleased changes](https://foss.heptapod.net/fluiddyn/fluidimage/-/compare/0.5.5...branch%2Fdefault).
+
+## [0.5.5] (2025-12-19)
+
+Few bug fixes and test/doc improvements.
+
+## [0.5.4] (2024-11-07)
+
+Few bug fixes and test/doc improvements.
 
 ## [0.5.3] (2024-07-25)
 
@@ -234,3 +242,5 @@ This version contains incompatible API changes documented here.
 [0.5.1]: https://foss.heptapod.net/fluiddyn/fluidimage/-/compare/0.5.0...0.5.1
 [0.5.2]: https://foss.heptapod.net/fluiddyn/fluidimage/-/compare/0.5.1...0.5.2
 [0.5.3]: https://foss.heptapod.net/fluiddyn/fluidimage/-/compare/0.5.2...0.5.3
+[0.5.4]: https://foss.heptapod.net/fluiddyn/fluidimage/-/compare/0.5.3...0.5.4
+[0.5.5]: https://foss.heptapod.net/fluiddyn/fluidimage/-/compare/0.5.4...0.5.5

Makefile

@@ -4,6 +4,7 @@
 develop: sync
 
 sync:
+	pdm sync --no-self
 	pdm sync --clean -v
 
 lock:

pixi.lock

@@ -1,4 +1,4 @@
-[project]
+[workspace]
 name = "fluidimage"
 channels = ["conda-forge"]
 platforms = ["linux-64", "win-64", "osx-64", "osx-arm64"]
@@ -31,7 +31,7 @@ pkg-config = ">=0.29.2"
 meson-python = ">=0.15.0"
 ninja = ">=1.11.1"
 meson = ">=1.3.2"
-pythran = ">=0.15.0"
+pythran = ">=0.15.0,<0.18.1"
 # tests
 pytest = ">=8.0.0"
 pytest-cov = ">=4.1.0"

pixi.toml

@@ -3,13 +3,13 @@ requires = [
     "meson-python",
     "numpy",
     "transonic>=0.6.2",
-    "pythran>=0.9.7",
+    "pythran>=0.9.7,<0.18.1",
 ]
 build-backend = 'mesonpy'
 
 [project]
 name = "fluidimage"
-version = "0.5.4"
+version = "0.5.5"
 description = "Fluid image processing with Python."
 authors = [
     {name = "Pierre Augier", email = "pierre.augier@legi.cnrs.fr"},
@@ -98,7 +98,7 @@ build = [
     "meson-python",
     "numpy",
     "transonic>=0.6.2",
-    "pythran>=0.9.7",
+    "pythran>=0.9.7,<0.18.1",
     "ninja",
 ]
 doc = [

pylock.toml

@@ -0,0 +1,19 @@
+[workspace]
+authors = ["pierre.augier <pierre.augier@univ-grenoble-alpes.fr>"]
+channels = ["conda-forge"]
+name = "env-fluidimage"
+platforms = ["linux-64"]
+version = "0.1.0"
+
+[tasks]
+
+[dependencies]
+matplotlib = ">=3.10.8"
+ipykernel = ">=7.1.0"
+ipympl = ">=0.9.8"
+fluidimage = ">=0.5.4"
+pytest = ">=9.0.2"
+pytest-cov = ">=7.0.0"
+pytest-asyncio = ">=1.3.0"
+textual = ">=6.10.0"
+python = ">=3.13"