Key units on strings to avoid Astropy bug

Author: AstroPatty

src/opencosmo/units/converters.py

@@ -103,9 +103,6 @@ def constructor(x):
         return unit
     power = u_base.powers[index]
     new_unit = u_base / cu.littleh**power
-    # There's a bug in astropy here, work around
-    if len(new_unit.powers) == 1 and new_unit.powers[0] == 1:
-        new_unit = new_unit.bases[0]
 
     return new_unit
 

src/opencosmo/units/handler.py

@@ -122,7 +122,9 @@ def with_conversions(
 
         self.verify_conversions(columns, self.__current_convention)
         new_column_conversions = self.__column_conversions | columns
-        new_conversions = self.__conversions | conversions
+        new_conversions = self.__conversions | {
+            str(key): value for key, value in conversions.items()
+        }
         return UnitHandler(
             self.__base_convention,
             self.__current_convention,
@@ -155,7 +157,7 @@ def apply_units(self, data: dict[str, np.ndarray], unit_kwargs):
                 unitful_value = applicator.apply(
                     value, self.__current_convention, unit_kwargs=unit_kwargs
                 )
-                unit_conversion = self.__conversions.get(unitful_value.unit)
+                unit_conversion = self.__conversions.get(str(unitful_value.unit))
                 if unit_conversion is not None and column_conversion is None:
                     unitful_value = unitful_value.to(unit_conversion)
                 elif column_conversion is not None: