Skip to content

Clean up units.py #2853

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
allisterakun wants to merge 3 commits into
base: dev
Choose a base branch
from
Draft

Clean up units.py #2853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
605ed71
Clean up `units.py`
allisterakun Mar 11, 2026
f2aaa34
Merge 605ed71f4a067a306b219a451d4cf1c74e8be211 into 009aca1c7efad7331…
allisterakun Mar 11, 2026
aced0f8
Apply Black Formatting
github-actions[bot] Mar 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions RUFAS/units.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@ class MeasurementUnits(Enum):
CENTIMETERS_PER_MILLIMETER = "cm/mm"
CONCEPTIONS = "conception"
CONCEPTIONS_PER_SERVICE = "conceptions per service"
COWS = "cows"
CUBIC_METERS = "m^3"
CUBIC_METERS_PER_DAY = "m^3/day"
CUBIC_METERS_PER_KILOGRAM = "m^3/kg"
CUBIC_METERS_PER_LITER = "m^3/L"
CUBIC_METERS_PER_CUBIC_MILLIMETER = "m^3/mm^3"
Expand Down Expand Up @@ -68,10 +66,8 @@ class MeasurementUnits(Enum):
LITERS_PER_HA = "L/ha"
LITERS_PER_KILOWATTS_PER_HOUR = "L/kWhr"
MEGACALORIES = "Mcal"
MEGACALORIES_PER_KILOGRAM = "Mcal/kg"
MEGAGRAMS_PER_KILOGRAM = "Mg/kg"
MEGAJOULES = "MJ"
MEGAJOULES_PER_CUBIC_METER = "MJ/m^3"
MEGAJOULES_PER_SQUARE_METER = "MJ/m^2"
METERS = "m"
METERS_PER_KILOMETER = "m/km"
Expand Down
8 changes: 0 additions & 8 deletions tests/test_units.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ def test_units_member_values() -> None:
assert MeasurementUnits.CENTIMETERS_PER_MILLIMETER.value == "cm/mm"
assert MeasurementUnits.CONCEPTIONS.value == "conception"
assert MeasurementUnits.CONCEPTIONS_PER_SERVICE.value == "conceptions per service"
assert MeasurementUnits.COWS.value == "cows"
assert MeasurementUnits.CUBIC_METERS.value == "m^3"
assert MeasurementUnits.CUBIC_METERS_PER_DAY.value == "m^3/day"
assert MeasurementUnits.CUBIC_METERS_PER_KILOGRAM.value == "m^3/kg"
assert MeasurementUnits.CUBIC_METERS_PER_LITER.value == "m^3/L"
assert MeasurementUnits.CUBIC_METERS_PER_CUBIC_MILLIMETER.value == "m^3/mm^3"
Expand Down Expand Up @@ -58,10 +56,8 @@ def test_units_member_values() -> None:
assert MeasurementUnits.LITERS.value == "L"
assert MeasurementUnits.LITERS_PER_CUBIC_METER.value == "L/m^3"
assert MeasurementUnits.MEGACALORIES.value == "Mcal"
assert MeasurementUnits.MEGACALORIES_PER_KILOGRAM.value == "Mcal/kg"
assert MeasurementUnits.MEGAGRAMS_PER_KILOGRAM.value == "Mg/kg"
assert MeasurementUnits.MEGAJOULES.value == "MJ"
assert MeasurementUnits.MEGAJOULES_PER_CUBIC_METER.value == "MJ/m^3"
assert MeasurementUnits.MEGAJOULES_PER_SQUARE_METER.value == "MJ/m^2"
assert MeasurementUnits.METERS.value == "m"
assert MeasurementUnits.METERS_PER_KILOMETER.value == "m/km"
Expand Down Expand Up @@ -101,9 +97,7 @@ def test_units_str_method() -> None:
assert str(MeasurementUnits.CENTIMETERS_PER_MILLIMETER) == "cm/mm"
assert str(MeasurementUnits.CONCEPTIONS) == "conception"
assert str(MeasurementUnits.CONCEPTIONS_PER_SERVICE) == "conceptions per service"
assert str(MeasurementUnits.COWS) == "cows"
assert str(MeasurementUnits.CUBIC_METERS) == "m^3"
assert str(MeasurementUnits.CUBIC_METERS_PER_DAY) == "m^3/day"
assert str(MeasurementUnits.CUBIC_METERS_PER_KILOGRAM) == "m^3/kg"
assert str(MeasurementUnits.CUBIC_METERS_PER_LITER) == "m^3/L"
assert str(MeasurementUnits.CUBIC_METERS_PER_CUBIC_MILLIMETER) == "m^3/mm^3"
Expand Down Expand Up @@ -142,9 +136,7 @@ def test_units_str_method() -> None:
assert str(MeasurementUnits.LITERS) == "L"
assert str(MeasurementUnits.LITERS_PER_CUBIC_METER) == "L/m^3"
assert str(MeasurementUnits.MEGACALORIES) == "Mcal"
assert str(MeasurementUnits.MEGACALORIES_PER_KILOGRAM) == "Mcal/kg"
assert str(MeasurementUnits.MEGAJOULES) == "MJ"
assert str(MeasurementUnits.MEGAJOULES_PER_CUBIC_METER) == "MJ/m^3"
assert str(MeasurementUnits.MEGAJOULES_PER_SQUARE_METER) == "MJ/m^2"
assert str(MeasurementUnits.METERS) == "m"
assert str(MeasurementUnits.METERS_PER_KILOMETER) == "m/km"
Expand Down