diff options
Diffstat (limited to 'pint/testsuite')
-rw-r--r-- | pint/testsuite/test_numpy.py | 16 | ||||
-rw-r--r-- | pint/testsuite/test_numpy_func.py | 1 | ||||
-rw-r--r-- | pint/testsuite/test_quantity.py | 30 | ||||
-rw-r--r-- | pint/testsuite/test_unit.py | 16 |
4 files changed, 30 insertions, 33 deletions
diff --git a/pint/testsuite/test_numpy.py b/pint/testsuite/test_numpy.py index b2097bb..affc8a5 100644 --- a/pint/testsuite/test_numpy.py +++ b/pint/testsuite/test_numpy.py @@ -4,7 +4,7 @@ import copy import operator as op import unittest -from pint import DimensionalityError, OffsetUnitCalculusError, set_application_registry +from pint import DimensionalityError, OffsetUnitCalculusError from pint.compat import np from pint.testsuite import QuantityTestCase, helpers from pint.testsuite.test_umath import TestUFuncs @@ -314,20 +314,20 @@ class TestNumpyMathematicalFunctions(TestNumpyMethods): @helpers.requires_array_function_protocol() def test_gradient(self): - l = np.gradient([[1, 1], [3, 4]] * self.ureg.m, 1 * self.ureg.J) + grad = np.gradient([[1, 1], [3, 4]] * self.ureg.m, 1 * self.ureg.J) self.assertQuantityEqual( - l[0], [[2.0, 3.0], [2.0, 3.0]] * self.ureg.m / self.ureg.J + grad[0], [[2.0, 3.0], [2.0, 3.0]] * self.ureg.m / self.ureg.J ) self.assertQuantityEqual( - l[1], [[0.0, 0.0], [1.0, 1.0]] * self.ureg.m / self.ureg.J + grad[1], [[0.0, 0.0], [1.0, 1.0]] * self.ureg.m / self.ureg.J ) - l = np.gradient(self.Q_([[1, 1], [3, 4]], self.ureg.degC), 1 * self.ureg.J) + grad = np.gradient(self.Q_([[1, 1], [3, 4]], self.ureg.degC), 1 * self.ureg.J) self.assertQuantityEqual( - l[0], [[2.0, 3.0], [2.0, 3.0]] * self.ureg.delta_degC / self.ureg.J + grad[0], [[2.0, 3.0], [2.0, 3.0]] * self.ureg.delta_degC / self.ureg.J ) self.assertQuantityEqual( - l[1], [[0.0, 0.0], [1.0, 1.0]] * self.ureg.delta_degC / self.ureg.J + grad[1], [[0.0, 0.0], [1.0, 1.0]] * self.ureg.delta_degC / self.ureg.J ) @helpers.requires_array_function_protocol() @@ -501,7 +501,7 @@ class TestNumpyUnclassified(TestNumpyMethods): ) @helpers.requires_array_function_protocol() - def test_compress(self): + def test_compress_nep18(self): self.assertQuantityEqual( np.compress([False, True], self.q, axis=1), [[2], [4]] * self.ureg.m ) diff --git a/pint/testsuite/test_numpy_func.py b/pint/testsuite/test_numpy_func.py index 262a2dd..b2c81ef 100644 --- a/pint/testsuite/test_numpy_func.py +++ b/pint/testsuite/test_numpy_func.py @@ -6,7 +6,6 @@ import pint.numpy_func from pint import DimensionalityError, OffsetUnitCalculusError from pint.compat import np from pint.numpy_func import ( - _get_first_input_units, _is_quantity, _is_quantity_sequence, convert_to_consistent_units, diff --git a/pint/testsuite/test_quantity.py b/pint/testsuite/test_quantity.py index 070d7f0..33a7eae 100644 --- a/pint/testsuite/test_quantity.py +++ b/pint/testsuite/test_quantity.py @@ -271,22 +271,24 @@ class TestQuantity(QuantityTestCase): ) def test_convert(self): - x = self.Q_("2*inch") - self.assertQuantityAlmostEqual(x.to("meter"), self.Q_(2.0 * 0.0254, "meter")) - x = self.Q_("2*meter") - self.assertQuantityAlmostEqual(x.to("inch"), self.Q_(2.0 / 0.0254, "inch")) - x = self.Q_("2*sidereal_second") - self.assertQuantityAlmostEqual(x.to("second"), self.Q_(1.994539133, "second")) - x = self.Q_("2.54*centimeter/second") - self.assertQuantityAlmostEqual(x.to("inch/second"), self.Q_(1, "inch/second")) - x = self.Q_("2.54*centimeter") - self.assertQuantityAlmostEqual(x.to("inch").magnitude, 1) self.assertQuantityAlmostEqual( - self.Q_(2, "second").to("millisecond").magnitude, 2000 + self.Q_("2 inch").to("meter"), self.Q_(2.0 * 0.0254, "meter") + ) + self.assertQuantityAlmostEqual( + self.Q_("2 meter").to("inch"), self.Q_(2.0 / 0.0254, "inch") + ) + self.assertQuantityAlmostEqual( + self.Q_("2 sidereal_year").to("second"), self.Q_(63116297.5325, "second") + ) + self.assertQuantityAlmostEqual( + self.Q_("2.54 centimeter/second").to("inch/second"), + self.Q_("1 inch/second"), ) + self.assertAlmostEqual(self.Q_("2.54 centimeter").to("inch").magnitude, 1) + self.assertAlmostEqual(self.Q_("2 second").to("millisecond").magnitude, 2000) @helpers.requires_numpy() - def test_convert(self): + def test_convert_numpy(self): # Conversions with single units take a different codepath than # Conversions with more than one unit. @@ -606,7 +608,7 @@ class TestQuantityBasicMath(QuantityTestCase): if isinstance(expected_result, str): expected_result = self.Q_(expected_result) - if not unit is None: + if unit is not None: value1 = value1 * unit value2 = value2 * unit expected_result = expected_result * unit @@ -630,7 +632,7 @@ class TestQuantityBasicMath(QuantityTestCase): if isinstance(expected_result, str): expected_result = self.Q_(expected_result) - if not unit is None: + if unit is not None: value1 = value1 * unit value2 = value2 * unit expected_result = expected_result * unit diff --git a/pint/testsuite/test_unit.py b/pint/testsuite/test_unit.py index 6327143..2b3cc40 100644 --- a/pint/testsuite/test_unit.py +++ b/pint/testsuite/test_unit.py @@ -84,12 +84,12 @@ class TestUnit(QuantityTestCase): for spec, result in ( ("L", r"\mathrm{oil\_barrel}"), ("P", "oil_barrel"), - ("H", "oil\_barrel"), + ("H", r"oil\_barrel"), ("C", "oil_barrel"), ("~", "oil_bbl"), ("L~", r"\mathrm{oil\_bbl}"), ("P~", "oil_bbl"), - ("H~", "oil\_bbl"), + ("H~", r"oil\_bbl"), ("C~", "oil_bbl"), ): with self.subTest(spec): @@ -212,7 +212,7 @@ class TestRegistry(QuantityTestCase): ureg.define("meter = [length]") self.assertRaises(DefinitionSyntaxError, ureg.define, "meter = [length]") self.assertRaises(TypeError, ureg.define, list()) - x = ureg.define("degC = kelvin; offset: 273.15") + ureg.define("degC = kelvin; offset: 273.15") def test_define(self): ureg = UnitRegistry(None) @@ -272,7 +272,6 @@ class TestRegistry(QuantityTestCase): self.ureg.parse_expression("kilometer"), self.Q_(1, UnitsContainer(kilometer=1.0)), ) - # self.assertEqual(self.ureg._units['kilometer'], self.Q_(1000., UnitsContainer(meter=1.))) def test_parse_complex(self): self.assertEqual( @@ -427,11 +426,8 @@ class TestRegistry(QuantityTestCase): self.assertEqual(self.ureg.get_symbol("international_inch"), "in") def test_pint(self): - p = self.ureg.pint - l = self.ureg.liter - ip = self.ureg.imperial_pint - self.assertLess(p, l) - self.assertLess(p, ip) + self.assertLess(self.ureg.pint, self.ureg.liter) + self.assertLess(self.ureg.pint, self.ureg.imperial_pint) def test_wraps(self): def func(x): @@ -742,7 +738,7 @@ class TestRegistryWithDefaultRegistry(TestRegistry): x.test = "test" self.assertIsInstance(x, UnitRegistry) y = LazyRegistry() - q = y("meter") + y("meter") self.assertIsInstance(y, UnitRegistry) def test_redefinition(self): |