Skip to content

Commit

Permalink
Merge branch 'master' into fix-cli-uncertainty-package-import
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewgsavage authored Jul 8, 2024
2 parents 4888138 + bffbbc2 commit a7e24a4
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Pint Changelog
-----------------

- Fix the default behaviour for pint-convert (cli) for importing uncertainties package
- Added ℓ as alternative for liter
- Support permille units and `‰` symbol (PR #2033, Issue #1963)


Expand Down
2 changes: 1 addition & 1 deletion pint/default_en.txt
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ hectare = 100 * are = ha

# Volume
[volume] = [length] ** 3
liter = decimeter ** 3 = l = L = litre
liter = decimeter ** 3 = l = L = ℓ = litre
cubic_centimeter = centimeter ** 3 = cc
lambda = microliter = λ
stere = meter ** 3
Expand Down
3 changes: 3 additions & 0 deletions pint/testsuite/test_issues.py
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,9 @@ def test_micro_creation_U03bc(self, module_registry):
def test_micro_creation_U00b5(self, module_registry):
module_registry.Quantity(2, "µm")

def test_liter_creation_U2113(self, module_registry):
module_registry.Quantity(2, "ℓ")

@helpers.requires_numpy
def test_issue171_real_imag(self, module_registry):
qr = [1.0, 2.0, 3.0, 4.0] * module_registry.meter
Expand Down

0 comments on commit a7e24a4

Please sign in to comment.