Adapt chempy.units to latest version of quantities

bjodah · Jul 16, 2023 · 5cd64c1 · 5cd64c1
1 parent c449eb0
commit 5cd64c1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/chempy/tests/test_units.py b/chempy/tests/test_units.py
@@ -221,7 +221,7 @@ def test_to_unitless__sympy():
     import sympy as sp
 
     assert sp.cos(to_unitless(sp.pi)) == -1
-    with pytest.raises(AttributeError):
+    with pytest.raises(Exception):
         to_unitless(sp.pi, u.second)
 
 

diff --git a/chempy/units.py b/chempy/units.py
@@ -386,7 +386,10 @@ def to_unitless(value, new_unit=None):
     else:
         try:
             try:
-                result = (value * pq.dimensionless / new_unit).rescale(pq.dimensionless)
+                mag = magnitude(value)
+                unt = unit_of(value)
+                conv = rescale(unt/new_unit, pq.dimensionless)
+                result = np.array(mag)*conv
             except AttributeError:
                 if new_unit == pq.dimensionless:
                     return value