Revert "Split units file into with and without dimensions files"

test/test_dimension.py

@@ -21,7 +21,6 @@
 
 import tunits
 import tunits.core as core
-import tunits.units_with_dimension
 
 
 def _all_dimensions() -> Iterator[type[core.ValueWithDimension]]:
@@ -83,10 +82,10 @@ def test_arithmetic_ops_preserve_type_array(
 
 
 def test_division_type() -> None:
-    t: tunits.Time = 3 * tunits.units_with_dimension.ns
+    t: tunits.Time = 3 * tunits.ns
 
     t = t / 2
-    assert t == 1.5 * tunits.units_with_dimension.ns
+    assert t == 1.5 * tunits.ns
 
     assert isinstance(1 / t, tunits.Value)
 

test/test_value_array.py

@@ -93,13 +93,13 @@ def test_dimensionless_act_like_arrays() -> None:
 def test_repr() -> None:
     from tunits.units import km, kg, s
 
-    assert repr(s * []) == "ValueArray(array([], dtype=float64), 's')"
-    assert repr(km * [2, 3]) == "ValueArray(array([2., 3.]), 'km')"
+    assert repr(s * []) == "TimeArray(array([], dtype=float64), 's')"
+    assert repr(km * [2, 3]) == "LengthArray(array([2., 3.]), 'km')"
     assert repr(km * kg * [3j]) == "ValueArray(array([0.+3.j]), 'kg*km')"
     assert repr(km**2 * [-1] / kg**3 * s) == "ValueArray(array([-1.]), 'km^2*s/kg^3')"
     assert repr(km ** (2 / 3.0) * [-1] / kg**3 * s) == "ValueArray(array([-1.]), 'km^(2/3)*s/kg^3')"
 
-    expected_repr = f"ValueArray({repr(np.array(range(50000), dtype=float))}, 'km')"
+    expected_repr = f"LengthArray({repr(np.array(range(50000), dtype=float))}, 'km')"
     assert repr(list(range(50000)) * km) == expected_repr
 
     # Fallback case.

test_perf/perf_testing_util.py

@@ -22,13 +22,11 @@
 
 import tunits
 from tunits import ValueWithDimension, ArrayWithDimension
-from tunits import units, units_with_dimension
+from tunits import units
 import tunits.core as core
 
 _ALL_VALUES_WITH_DIMENSION = [
-    obj
-    for name in dir(units_with_dimension)
-    if isinstance(obj := getattr(units_with_dimension, name), ValueWithDimension)
+    obj for name in dir(units) if isinstance(obj := getattr(units, name), ValueWithDimension)
 ]
 
 

tunits/__init__.py

@@ -96,4 +96,3 @@
 )
 
 from tunits.units import *
-import tunits.units_with_dimension