Merge branch 'topic/default/lock' into 'branch/default'

pdm lock and adapt saved files See merge request fluiddyn/transonic!136
fluiddyn · Mar 29, 2024 · e12a786 · e12a786
2 parents 60650ae + 3d3814c
commit e12a786
Show file tree

Hide file tree

Showing 13 changed files with 812 additions and 703 deletions.
diff --git a/data_tests/saved__backend__/cython/block_fluidsim.py b/data_tests/saved__backend__/cython/block_fluidsim.py
@@ -5,6 +5,7 @@
 
 
 def rk2_step0(state_spect_n12, state_spect, tendencies_n, diss2, dt):
+
     # transonic block (
     #     complex128[][][] state_spect_n12, state_spect,
     #                      tendencies_n;

diff --git a/data_tests/saved__backend__/cython/blocks_type_hints.py b/data_tests/saved__backend__/cython/blocks_type_hints.py
@@ -5,6 +5,7 @@
 
 
 def block0(a, b, n):
+
     # transonic block (
     #     A a; A1 b;
     #     int n

diff --git a/data_tests/saved__backend__/cython/class_blocks.py b/data_tests/saved__backend__/cython/class_blocks.py
@@ -7,6 +7,7 @@
 
 
 def block0(a, b, n):
+
     # foo
     # transonic block (
     #     float[][] a, b;
@@ -25,6 +26,7 @@ def block0(a, b, n):
 
 
 def block1(a, b, n):
+
     # transonic block (
     #     float[][] a, b;
     #     int n

diff --git a/data_tests/saved__backend__/python/block_fluidsim.py b/data_tests/saved__backend__/python/block_fluidsim.py
@@ -1,4 +1,5 @@
 def rk2_step0(state_spect_n12, state_spect, tendencies_n, diss2, dt):
+
     # transonic block (
     #     complex128[][][] state_spect_n12, state_spect,
     #                      tendencies_n;

diff --git a/data_tests/saved__backend__/python/blocks_type_hints.py b/data_tests/saved__backend__/python/blocks_type_hints.py
@@ -1,4 +1,5 @@
 def block0(a, b, n):
+
     # transonic block (
     #     A a; A1 b;
     #     int n

diff --git a/data_tests/saved__backend__/python/class_blocks.py b/data_tests/saved__backend__/python/class_blocks.py
@@ -2,6 +2,7 @@
 
 
 def block0(a, b, n):
+
     # foo
     # transonic block (
     #     float[][] a, b;
@@ -20,6 +21,7 @@ def block0(a, b, n):
 
 
 def block1(a, b, n):
+
     # transonic block (
     #     float[][] a, b;
     #     int n

diff --git a/data_tests/saved__backend__/pythran/block_fluidsim.py b/data_tests/saved__backend__/pythran/block_fluidsim.py
@@ -1,4 +1,5 @@
 def rk2_step0(state_spect_n12, state_spect, tendencies_n, diss2, dt):
+
     # transonic block (
     #     complex128[][][] state_spect_n12, state_spect,
     #                      tendencies_n;

diff --git a/data_tests/saved__backend__/pythran/blocks_type_hints.py b/data_tests/saved__backend__/pythran/blocks_type_hints.py
@@ -1,4 +1,5 @@
 def block0(a, b, n):
+
     # transonic block (
     #     A a; A1 b;
     #     int n

diff --git a/data_tests/saved__backend__/pythran/class_blocks.py b/data_tests/saved__backend__/pythran/class_blocks.py
@@ -2,6 +2,7 @@
 
 
 def block0(a, b, n):
+
     # foo
     # transonic block (
     #     float[][] a, b;
@@ -20,6 +21,7 @@ def block0(a, b, n):
 
 
 def block1(a, b, n):
+
     # transonic block (
     #     float[][] a, b;
     #     int n

diff --git a/pdm.lock b/pdm.lock
diff --git a/pixi.lock b/pixi.lock
diff --git a/pixi.toml b/pixi.toml
@@ -20,7 +20,7 @@ scipy = ">=1.11.4,<1.12"
 pytest = ">=7.4.4,<7.5"
 pytest-cov = ">=4.1.0,<4.2"
 coverage = ">=7.4.0,<7.5"
-black = ">=23.12.1,<23.13"
+black = ">=24.3.0,<24.4"
 mpi4py = ">=3.1.5,<3.2"
 pip = ">=23.3.2,<23.4"
 numba = ">=0.58.1,<0.59"

diff --git a/pyproject.toml b/pyproject.toml
@@ -38,7 +38,9 @@ transonic-init-meson = "transonic_cl.init_meson:main"
 transonic-clean-dir = "transonic_cl.clean_dir:main"
 
 [tool.pdm]
+distribution = true
 package-dir = "src"
+ignore_package_warnings = ["ipython"]
 
 [tool.pdm.dev-dependencies]
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ @@
     def block0(a, b, n):
         # transonic block (
         #     A a; A1 b;
         #     int n
@@ Expand Down @@