diff options
Diffstat (limited to 'pint/testsuite')
| -rw-r--r-- | pint/testsuite/helpers.py | 4 | ||||
| -rw-r--r-- | pint/testsuite/test_quantity.py | 16 |
2 files changed, 9 insertions, 11 deletions
diff --git a/pint/testsuite/helpers.py b/pint/testsuite/helpers.py index ca0e978..570b287 100644 --- a/pint/testsuite/helpers.py +++ b/pint/testsuite/helpers.py @@ -140,9 +140,7 @@ requires_uncertainties = pytest.mark.skipif( requires_not_uncertainties = pytest.mark.skipif( HAS_UNCERTAINTIES, reason="Requires Uncertainties not to be installed." ) -requires_mip = pytest.mark.skipif( - not HAS_MIP, reason="Requires MIP" -) +requires_mip = pytest.mark.skipif(not HAS_MIP, reason="Requires MIP") # Parametrization diff --git a/pint/testsuite/test_quantity.py b/pint/testsuite/test_quantity.py index 08b9a70..e51ec11 100644 --- a/pint/testsuite/test_quantity.py +++ b/pint/testsuite/test_quantity.py @@ -379,14 +379,14 @@ class TestQuantity(QuantityTestCase): ureg.define("pound_mass = 0.45359237 kg = lbm") preferred_units = [ - ureg.ft, # distance L - ureg.slug, # mass M - ureg.s, # duration T - ureg.rankine, # temperature Θ - ureg.lbf, # force L M T^-2 - ureg.psf, # pressure M L^−1 T^−2 - ureg.lbm * ureg.ft**-3, # density M L^-3 - ureg.W # power L^2 M T^-3 + ureg.ft, # distance L + ureg.slug, # mass M + ureg.s, # duration T + ureg.rankine, # temperature Θ + ureg.lbf, # force L M T^-2 + ureg.psf, # pressure M L^−1 T^−2 + ureg.lbm * ureg.ft**-3, # density M L^-3 + ureg.W, # power L^2 M T^-3 ] temp = (Q_("1 lbf") * Q_("1 m/s")).to_preferred(preferred_units) |