dclab 0.62.11__tar.gz → 0.62.12__tar.gz

{dclab-0.62.11 → dclab-0.62.12}/.readthedocs.yml

@@ -8,6 +8,8 @@ build:
   jobs:
     post_checkout:
       - git fetch --unshallow || true
+sphinx:
+  configuration: docs/conf.py
 python:
   install:
     - requirements: docs/requirements.txt

{dclab-0.62.11 → dclab-0.62.12}/CHANGELOG

@@ -1,3 +1,5 @@
+0.62.12
+ - fix: viscosity computation for MP-PBS at zero flow rate should be NaN
 0.62.11
  - enh: support plain `numpy.array` tables
 0.62.10

{dclab-0.62.11 → dclab-0.62.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dclab
-Version: 0.62.11
+Version: 0.62.12
 Summary: Library for real-time deformability cytometry (RT-DC)
 Author: Benedikt Hartmann, Eoghan O'Connell, Maik Herbig, Maximilian Schlögel, Nadia Sbaa, Paul Müller, Philipp Rosendahl, Raghava Alajangi
 Maintainer-email: Paul Müller <dev@craban.de>

{dclab-0.62.11 → dclab-0.62.12}/dclab/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.62.11'
-__version_tuple__ = version_tuple = (0, 62, 11)
+__version__ = version = '0.62.12'
+__version_tuple__ = version_tuple = (0, 62, 12)

{dclab-0.62.11 → dclab-0.62.12}/dclab/features/emodulus/viscosity.py

@@ -120,6 +120,10 @@ def get_viscosity(medium: str = "0.49% MC-PBS",
     if medium == "water":
         # We ignore the `model`, because it's user convenient.
         eta = get_viscosity_water_kestin_1978(temperature=temperature)
+    elif not flow_rate:
+        # When flow rate is zero, we cannot compute the viscosity for
+        # anything other than water above.
+        eta = np.nan
     elif medium in ["0.49% MC-PBS", "0.59% MC-PBS", "0.83% MC-PBS"]:
         kwargs = {"medium": medium,
                   "temperature": temperature,

{dclab-0.62.11 → dclab-0.62.12}/dclab.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dclab
-Version: 0.62.11
+Version: 0.62.12
 Summary: Library for real-time deformability cytometry (RT-DC)
 Author: Benedikt Hartmann, Eoghan O'Connell, Maik Herbig, Maximilian Schlögel, Nadia Sbaa, Paul Müller, Philipp Rosendahl, Raghava Alajangi
 Maintainer-email: Paul Müller <dev@craban.de>

{dclab-0.62.11 → dclab-0.62.12}/tests/test_feat_emodulus_viscosity.py

@@ -62,6 +62,15 @@ def test_buyukurganci_cell_carrier():
         assert np.allclose(eta, b)
 
 
+def test_buyukurganci_cell_carrier_zero_flow_rate():
+    eta = emodulus.viscosity.get_viscosity(medium="0.59% MC-PBS",
+                                           channel_width=20,
+                                           flow_rate=0,
+                                           temperature=21.5,
+                                           model='buyukurganci-2022')
+    assert np.isnan(eta)
+
+
 @pytest.mark.parametrize("medium", ["0.49% MC-PBS", "0.59% MC-PBS"])
 def test_buyukurganci_mcpbs_range(medium):
     # test values
@@ -166,6 +175,14 @@ def test_kestin_water():
                                            temperature=ref[:, 0])
     assert np.allclose(res, ref[:, 1], rtol=8e-5, atol=0)
 
+    # Since water viscosity is not dependent on flow rate, setting
+    # flow rate to zero should still work.
+    res2 = emodulus.viscosity.get_viscosity(medium="water",
+                                            temperature=ref[:, 0],
+                                            flow_rate=0,
+                                            )
+    assert np.allclose(res2, ref[:, 1], rtol=8e-5, atol=0)
+
 
 def test_kestin_water_range():
     # test values

{dclab-0.62.11 → dclab-0.62.12}/tests/test_rtdc_fmt_tdms.py

@@ -263,7 +263,11 @@ def test_image_basic():
     # Transition image
     assert np.allclose(ds["image"][0], 0)
     # Real image
-    assert np.allclose(np.average(ds["image"][1]), 45.1490478515625)
+    # 2025-01-23: paulmueller added the atol value, because CI was failing
+    #             on macOS. Possible reason is underlying ffmpeg build
+    #             for M1 etc. arm processors :zany_face:
+    assert np.allclose(np.average(ds["image"][1]), 45.1490478515625,
+                       atol=0.5)
 
 
 @pytest.mark.filterwarnings(