diff options
40 files changed, 6 insertions, 98 deletions
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 8ee5e75..b012d24 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,5 +1,5 @@ - [ ] Closes # (insert issue number) -- [ ] Executed ``pre-commit run --all-files`` with no errors +- [ ] Executed `pre-commit run --all-files` with no errors - [ ] The change is fully covered by automated unit tests - [ ] Documented in docs/ as appropriate - [ ] Added an entry to the CHANGES file diff --git a/benchmarks/benchmarks/10_registry.py b/benchmarks/benchmarks/10_registry.py index 1019eb5..41da67b 100644 --- a/benchmarks/benchmarks/10_registry.py +++ b/benchmarks/benchmarks/10_registry.py @@ -15,7 +15,6 @@ data = {} def setup(*args): - global ureg, data data["int"] = 1 diff --git a/benchmarks/benchmarks/20_quantity.py b/benchmarks/benchmarks/20_quantity.py index 5f6dd41..c0174ef 100644 --- a/benchmarks/benchmarks/20_quantity.py +++ b/benchmarks/benchmarks/20_quantity.py @@ -20,7 +20,6 @@ data = {} def setup(*args): - global ureg, data data["int"] = 1 diff --git a/benchmarks/benchmarks/30_numpy.py b/benchmarks/benchmarks/30_numpy.py index ec83833..15ae66c 100644 --- a/benchmarks/benchmarks/30_numpy.py +++ b/benchmarks/benchmarks/30_numpy.py @@ -29,7 +29,6 @@ def float_range(n): def setup(*args): - global ureg, data short = list(float_range(3)) mid = list(float_range(1_000)) diff --git a/pint/compat.py b/pint/compat.py index 4e0fba8..aff518a 100644 --- a/pint/compat.py +++ b/pint/compat.py @@ -80,7 +80,6 @@ try: NP_NO_VALUE = np._NoValue except ImportError: - np = None class ndarray: diff --git a/pint/delegates/base_defparser.py b/pint/delegates/base_defparser.py index b2de999..d35f3e3 100644 --- a/pint/delegates/base_defparser.py +++ b/pint/delegates/base_defparser.py @@ -73,7 +73,6 @@ def build_disk_cache_class(non_int_type: type): @dataclass(frozen=True) class PintHeader(fc.InvalidateByExist, fc.NameByFields, fc.BasicPythonHeader): - from .. import __version__ pint_version: str = __version__ @@ -97,7 +96,6 @@ def build_disk_cache_class(non_int_type: type): return cls(tuple(tmp), reader_id) class PintDiskCache(fc.DiskCache): - _header_classes = { pathlib.Path: PathHeader, str: PathHeader.from_string, diff --git a/pint/delegates/txt_defparser/common.py b/pint/delegates/txt_defparser/common.py index 961f111..493d0ec 100644 --- a/pint/delegates/txt_defparser/common.py +++ b/pint/delegates/txt_defparser/common.py @@ -44,7 +44,6 @@ class DefinitionSyntaxError(errors.DefinitionSyntaxError, fp.ParsingError): @dataclass(frozen=True) class ImportDefinition(fp.IncludeStatement): - value: str @property diff --git a/pint/delegates/txt_defparser/defparser.py b/pint/delegates/txt_defparser/defparser.py index 6112690..0b99d6d 100644 --- a/pint/delegates/txt_defparser/defparser.py +++ b/pint/delegates/txt_defparser/defparser.py @@ -10,7 +10,6 @@ from . import block, common, context, defaults, group, plain, system class PintRootBlock(fp.RootBlock): - body: fp.Multi[ ty.Union[ plain.CommentDefinition, @@ -59,7 +58,6 @@ class _PintParser(fp.Parser): class DefParser: - skip_classes = (fp.BOF, fp.BOR, fp.BOS, fp.EOS, plain.CommentDefinition) def __init__(self, default_config, diskcache): diff --git a/pint/errors.py b/pint/errors.py index 0cd3590..01ebcd4 100644 --- a/pint/errors.py +++ b/pint/errors.py @@ -225,7 +225,6 @@ class LogarithmicUnitCalculusError(PintTypeError): @dataclass(frozen=False) class UnitStrippedWarning(UserWarning, PintError): - msg: str def __reduce__(self): diff --git a/pint/facets/context/objects.py b/pint/facets/context/objects.py index 6f2307a..40c2bb5 100644 --- a/pint/facets/context/objects.py +++ b/pint/facets/context/objects.py @@ -74,7 +74,6 @@ class Context: aliases: Tuple[str, ...] = (), defaults: Optional[dict] = None, ) -> None: - self.name = name self.aliases = aliases diff --git a/pint/facets/context/registry.py b/pint/facets/context/registry.py index 2b56299..ccf69d2 100644 --- a/pint/facets/context/registry.py +++ b/pint/facets/context/registry.py @@ -378,7 +378,6 @@ class ContextRegistry(PlainRegistry): # destination dimensionality. If it exists, we transform the source value # by applying sequentially each transformation of the path. if self._active_ctx: - src_dim = self._get_dimensionality(src) dst_dim = self._get_dimensionality(dst) diff --git a/pint/facets/dask/__init__.py b/pint/facets/dask/__init__.py index 5276d3c..42fced0 100644 --- a/pint/facets/dask/__init__.py +++ b/pint/facets/dask/__init__.py @@ -32,7 +32,6 @@ def check_dask_array(f): class DaskQuantity: - # Dask.array.Array ducking def __dask_graph__(self): if isinstance(self._magnitude, dask_array.Array): @@ -121,5 +120,4 @@ class DaskQuantity: class DaskRegistry(PlainRegistry): - _quantity_class = DaskQuantity diff --git a/pint/facets/formatting/objects.py b/pint/facets/formatting/objects.py index 7435c37..1ba92c9 100644 --- a/pint/facets/formatting/objects.py +++ b/pint/facets/formatting/objects.py @@ -25,7 +25,6 @@ from ...util import UnitsContainer, iterable class FormattingQuantity: - _exp_pattern = re.compile(r"([0-9]\.?[0-9]*)e(-?)\+?0*([0-9]+)") def __format__(self, spec: str) -> str: diff --git a/pint/facets/formatting/registry.py b/pint/facets/formatting/registry.py index 246cc43..bd9c74c 100644 --- a/pint/facets/formatting/registry.py +++ b/pint/facets/formatting/registry.py @@ -13,6 +13,5 @@ from .objects import FormattingQuantity, FormattingUnit class FormattingRegistry(PlainRegistry): - _quantity_class = FormattingQuantity _unit_class = FormattingUnit diff --git a/pint/facets/group/objects.py b/pint/facets/group/objects.py index 67fa136..558a107 100644 --- a/pint/facets/group/objects.py +++ b/pint/facets/group/objects.py @@ -123,7 +123,6 @@ class Group(SharedRegistryObject): """Add groups to group.""" d = self._REGISTRY._groups for group_name in group_names: - grp = d[group_name] if grp.is_used_group(self.name): diff --git a/pint/facets/group/registry.py b/pint/facets/group/registry.py index c4ed0be..0036c1d 100644 --- a/pint/facets/group/registry.py +++ b/pint/facets/group/registry.py @@ -84,7 +84,6 @@ class GroupRegistry(PlainRegistry): self.get_group("root").add_units(definition.name) def _add_group(self, gd: GroupDefinition): - if gd.name in self._groups: raise ValueError(f"Group {gd.name} already present in registry") try: @@ -119,7 +118,6 @@ class GroupRegistry(PlainRegistry): return self.Group(name) def _get_compatible_units(self, input_units, group) -> FrozenSet["Unit"]: - ret = super()._get_compatible_units(input_units, group) if not group: diff --git a/pint/facets/measurement/objects.py b/pint/facets/measurement/objects.py index 88fad0a..0fed93f 100644 --- a/pint/facets/measurement/objects.py +++ b/pint/facets/measurement/objects.py @@ -19,7 +19,6 @@ MISSING = object() class MeasurementQuantity: - # Measurement support def plus_minus(self, error, relative=False): if isinstance(error, self.__class__): @@ -102,7 +101,6 @@ class Measurement(PlainQuantity): return "{}".format(self) def __format__(self, spec): - spec = spec or self.default_format # special cases diff --git a/pint/facets/measurement/registry.py b/pint/facets/measurement/registry.py index f5c9621..e704399 100644 --- a/pint/facets/measurement/registry.py +++ b/pint/facets/measurement/registry.py @@ -16,7 +16,6 @@ from .objects import Measurement, MeasurementQuantity class MeasurementRegistry(PlainRegistry): - _quantity_class = MeasurementQuantity _measurement_class = Measurement diff --git a/pint/facets/nonmultiplicative/registry.py b/pint/facets/nonmultiplicative/registry.py index fc71bc5..17b053e 100644 --- a/pint/facets/nonmultiplicative/registry.py +++ b/pint/facets/nonmultiplicative/registry.py @@ -148,7 +148,6 @@ class NonMultiplicativeRegistry(PlainRegistry): return None def _add_ref_of_log_or_offset_unit(self, offset_unit, all_units): - slct_unit = self._units[offset_unit] if slct_unit.is_logarithmic or (not slct_unit.is_multiplicative): # Extract reference unit diff --git a/pint/facets/numpy/quantity.py b/pint/facets/numpy/quantity.py index 2436100..0d335cd 100644 --- a/pint/facets/numpy/quantity.py +++ b/pint/facets/numpy/quantity.py @@ -111,7 +111,6 @@ class NumpyQuantity: return _to_magnitude(self._magnitude, force_ndarray=True) def clip(self, min=None, max=None, out=None, **kwargs): - if min is not None: if isinstance(min, self.__class__): min = min.to(self).magnitude diff --git a/pint/facets/numpy/registry.py b/pint/facets/numpy/registry.py index 8ae6088..fa4768f 100644 --- a/pint/facets/numpy/registry.py +++ b/pint/facets/numpy/registry.py @@ -15,6 +15,5 @@ from .unit import NumpyUnit class NumpyRegistry(PlainRegistry): - _quantity_class = NumpyQuantity _unit_class = NumpyUnit diff --git a/pint/facets/numpy/unit.py b/pint/facets/numpy/unit.py index fc94853..0b5007f 100644 --- a/pint/facets/numpy/unit.py +++ b/pint/facets/numpy/unit.py @@ -12,7 +12,6 @@ from ...compat import is_upcast_type class NumpyUnit: - __array_priority__ = 17 def __array_ufunc__(self, ufunc, method, *inputs, **kwargs): diff --git a/pint/facets/plain/quantity.py b/pint/facets/plain/quantity.py index 314cc3a..3b5fef9 100644 --- a/pint/facets/plain/quantity.py +++ b/pint/facets/plain/quantity.py @@ -1004,7 +1004,6 @@ class PlainQuantity(PrettyIPython, SharedRegistryObject, Generic[_MagnitudeType] no_offset_units_self = len(offset_units_self) if not self._check(other): - if not self._ok_for_muldiv(no_offset_units_self): raise OffsetUnitCalculusError(self._units, getattr(other, "units", "")) if len(offset_units_self) == 1: @@ -1074,7 +1073,6 @@ class PlainQuantity(PrettyIPython, SharedRegistryObject, Generic[_MagnitudeType] no_offset_units_self = len(offset_units_self) if not self._check(other): - if not self._ok_for_muldiv(no_offset_units_self): raise OffsetUnitCalculusError(self._units, getattr(other, "units", "")) if len(offset_units_self) == 1: diff --git a/pint/facets/plain/registry.py b/pint/facets/plain/registry.py index eed73e1..da316ef 100644 --- a/pint/facets/plain/registry.py +++ b/pint/facets/plain/registry.py @@ -71,7 +71,6 @@ from .definitions import ( from .objects import PlainQuantity, PlainUnit if TYPE_CHECKING: - if HAS_BABEL: import babel @@ -940,7 +939,6 @@ class PlainRegistry(metaclass=RegistryMeta): """ if check_dimensionality: - src_dim = self._get_dimensionality(src) dst_dim = self._get_dimensionality(dst) @@ -1121,7 +1119,6 @@ class PlainRegistry(metaclass=RegistryMeta): return ret def _eval_token(self, token, case_sensitive=None, use_decimal=False, **values): - # TODO: remove this code when use_decimal is deprecated if use_decimal: raise DeprecationWarning( diff --git a/pint/facets/system/registry.py b/pint/facets/system/registry.py index 2bab44b..ce544bf 100644 --- a/pint/facets/system/registry.py +++ b/pint/facets/system/registry.py @@ -87,7 +87,6 @@ class SystemRegistry(GroupRegistry): self._register_adder(SystemDefinition, self._add_system) def _add_system(self, sd: SystemDefinition): - if sd.name in self._systems: raise ValueError(f"System {sd.name} already present in registry") @@ -186,7 +185,6 @@ class SystemRegistry(GroupRegistry): check_nonmult: bool = True, system: Union[str, System, None] = None, ): - if system is None: system = self._default_system @@ -227,7 +225,6 @@ class SystemRegistry(GroupRegistry): return base_factor, destination_units def _get_compatible_units(self, input_units, group_or_system) -> FrozenSet[Unit]: - if group_or_system is None: group_or_system = self._default_system diff --git a/pint/registry.py b/pint/registry.py index a5aa9b3..29d5c89 100644 --- a/pint/registry.py +++ b/pint/registry.py @@ -88,7 +88,6 @@ class UnitRegistry( case_sensitive: bool = True, cache_folder=None, ): - super().__init__( filename=filename, force_ndarray=force_ndarray, diff --git a/pint/registry_helpers.py b/pint/registry_helpers.py index 8517ff3..a12a8f1 100644 --- a/pint/registry_helpers.py +++ b/pint/registry_helpers.py @@ -72,7 +72,6 @@ def _to_units_container(a, registry=None): def _parse_wrap_args(args, registry=None): - # Arguments which contain definitions # (i.e. names that appear alone and for the first time) defs_args = set() @@ -143,7 +142,6 @@ def _parse_wrap_args(args, registry=None): # third pass: convert other arguments for ndx in unit_args_ndx: - if isinstance(values[ndx], ureg.Quantity): new_values[ndx] = ureg._convert( values[ndx]._magnitude, values[ndx]._units, args_as_uc[ndx][0] @@ -256,7 +254,6 @@ def wraps( ret = _to_units_container(ret, ureg) def decorator(func: Callable[..., T]) -> Callable[..., Quantity[T]]: - count_params = len(signature(func).parameters) if len(args) != count_params: raise TypeError( @@ -273,7 +270,6 @@ def wraps( @functools.wraps(func, assigned=assigned, updated=updated) def wrapper(*values, **kw) -> Quantity[T]: - values, kw = _apply_defaults(func, values, kw) # In principle, the values are used as is @@ -339,7 +335,6 @@ def check( ] def decorator(func): - count_params = len(signature(func).parameters) if len(dimensions) != count_params: raise TypeError( @@ -359,7 +354,6 @@ def check( list_args, empty = _apply_defaults(func, args, kwargs) for dim, value in zip(dimensions, list_args): - if dim is None: continue diff --git a/pint/testsuite/test_compat_downcast.py b/pint/testsuite/test_compat_downcast.py index 8293580..ebb5907 100644 --- a/pint/testsuite/test_compat_downcast.py +++ b/pint/testsuite/test_compat_downcast.py @@ -109,7 +109,6 @@ def array(request): def test_univariate_op_consistency( local_registry, q_base, op, magnitude_op, unit_op, array ): - q = local_registry.Quantity(array, "meter") res = op(local_registry, q) assert np.all( @@ -130,7 +129,6 @@ def test_univariate_op_consistency( ], ) def test_bivariate_op_consistency(local_registry, q_base, op, unit, array): - # This is to avoid having a ureg built at the module level. unit = unit(local_registry) diff --git a/pint/testsuite/test_contexts.py b/pint/testsuite/test_contexts.py index ea6eadc..c7551e4 100644 --- a/pint/testsuite/test_contexts.py +++ b/pint/testsuite/test_contexts.py @@ -323,7 +323,6 @@ class TestContexts: q.to("Hz") def test_context_with_arg(self, func_registry): - ureg = func_registry add_arg_ctxs(ureg) @@ -352,7 +351,6 @@ class TestContexts: q.to("Hz") def test_enable_context_with_arg(self, func_registry): - ureg = func_registry add_arg_ctxs(ureg) @@ -386,7 +384,6 @@ class TestContexts: ureg.disable_contexts(1) def test_context_with_arg_def(self, func_registry): - ureg = func_registry add_argdef_ctxs(ureg) @@ -427,7 +424,6 @@ class TestContexts: q.to("Hz") def test_context_with_sharedarg_def(self, func_registry): - ureg = func_registry add_sharedargdef_ctxs(ureg) @@ -499,7 +495,6 @@ class TestContexts: helpers.assert_quantity_equal(x.to("s"), ureg("1 s")) def _test_ctx(self, ctx, ureg): - q = 500 * ureg.meter s = (ureg.speed_of_light / q).to("Hz") @@ -563,7 +558,6 @@ class TestContexts: ], ) def test_parse_simple(self, func_registry, source, name, aliases, defaults): - a = Context.__keytransform__( UnitsContainer({"[time]": -1}), UnitsContainer({"[length]": 1}) ) @@ -579,7 +573,6 @@ class TestContexts: self._test_ctx(c, func_registry) def test_parse_auto_inverse(self, func_registry): - a = Context.__keytransform__( UnitsContainer({"[time]": -1.0}), UnitsContainer({"[length]": 1.0}) ) @@ -638,7 +631,6 @@ class TestContexts: Context.from_lines(s) def test_warnings(self, caplog, func_registry): - ureg = func_registry with caplog.at_level(logging.DEBUG, "pint"): diff --git a/pint/testsuite/test_definitions.py b/pint/testsuite/test_definitions.py index fbf7450..2618c6e 100644 --- a/pint/testsuite/test_definitions.py +++ b/pint/testsuite/test_definitions.py @@ -24,7 +24,6 @@ class TestDefinition: Definition.from_string("[x] = [time] * meter") def test_prefix_definition(self): - with pytest.raises(ValueError): Definition.from_string("m- = 1e-3 k") @@ -99,7 +98,6 @@ class TestDefinition: ) def test_log_unit_definition(self): - x = Definition.from_string( "decibelmilliwatt = 1e-3 watt; logbase: 10; logfactor: 10 = dBm" ) diff --git a/pint/testsuite/test_issues.py b/pint/testsuite/test_issues.py index 0c1155c..9b2a0e3 100644 --- a/pint/testsuite/test_issues.py +++ b/pint/testsuite/test_issues.py @@ -15,7 +15,6 @@ from pint.util import ParserHelper # TODO: do not subclass from QuantityTestCase class TestIssues(QuantityTestCase): - kwargs = dict(autoconvert_offset_to_baseunit=False) @pytest.mark.xfail @@ -250,7 +249,6 @@ class TestIssues(QuantityTestCase): assert dis.value == acc.value * tim.value**2 / 2 def test_issue85(self, module_registry): - T = 4.0 * module_registry.kelvin m = 1.0 * module_registry.amu va = 2.0 * module_registry.k * T / m @@ -263,7 +261,6 @@ class TestIssues(QuantityTestCase): helpers.assert_quantity_almost_equal(va.to_base_units(), vb.to_base_units()) def test_issue86(self, module_registry): - module_registry.autoconvert_offset_to_baseunit = True def parts(q): @@ -335,7 +332,6 @@ class TestIssues(QuantityTestCase): helpers.assert_quantity_almost_equal(z, 5.1 * module_registry.meter) def test_issue104(self, module_registry): - x = [ module_registry("1 meter"), module_registry("1 meter"), @@ -362,7 +358,6 @@ class TestIssues(QuantityTestCase): helpers.assert_quantity_almost_equal(y[0], module_registry.Quantity(1, "meter")) def test_issue105(self, module_registry): - func = module_registry.parse_unit_name val = list(func("meter")) assert list(func("METER")) == [] @@ -474,7 +469,6 @@ class TestIssues(QuantityTestCase): @helpers.requires_numpy def test_issue483(self, module_registry): - a = np.asarray([1, 2, 3]) q = [1, 2, 3] * module_registry.dimensionless p = (q**q).m diff --git a/pint/testsuite/test_log_units.py b/pint/testsuite/test_log_units.py index f9dfe77..2a048f6 100644 --- a/pint/testsuite/test_log_units.py +++ b/pint/testsuite/test_log_units.py @@ -16,7 +16,6 @@ def module_registry_auto_offset(): # TODO: do not subclass from QuantityTestCase class TestLogarithmicQuantity(QuantityTestCase): def test_log_quantity_creation(self, caplog): - # Following Quantity Creation Pattern for args in ( (4.2, "dBm"), diff --git a/pint/testsuite/test_measurement.py b/pint/testsuite/test_measurement.py index 926b4d6..b78ca0e 100644 --- a/pint/testsuite/test_measurement.py +++ b/pint/testsuite/test_measurement.py @@ -193,7 +193,6 @@ class TestMeasurement(QuantityTestCase): v.plus_minus(u, relative=True) def test_propagate_linear(self): - v1, u1 = self.Q_(8.0, "s"), self.Q_(0.7, "s") v2, u2 = self.Q_(5.0, "s"), self.Q_(0.6, "s") v2, u3 = self.Q_(-5.0, "s"), self.Q_(0.6, "s") @@ -241,7 +240,6 @@ class TestMeasurement(QuantityTestCase): assert r.value.units == ml.value.units def test_propagate_product(self): - v1, u1 = self.Q_(8.0, "s"), self.Q_(0.7, "s") v2, u2 = self.Q_(5.0, "s"), self.Q_(0.6, "s") v2, u3 = self.Q_(-5.0, "s"), self.Q_(0.6, "s") diff --git a/pint/testsuite/test_non_int.py b/pint/testsuite/test_non_int.py index f616622..66637e1 100644 --- a/pint/testsuite/test_non_int.py +++ b/pint/testsuite/test_non_int.py @@ -17,7 +17,6 @@ class NonIntTypeTestCase(QuantityTestCase): def assert_quantity_almost_equal( self, first, second, rtol="1e-07", atol="0", msg=None ): - if isinstance(first, self.Q_): assert isinstance(first.m, (self.kwargs["non_int_type"], int)) else: @@ -42,7 +41,6 @@ class NonIntTypeTestCase(QuantityTestCase): class _TestBasic(NonIntTypeTestCase): def test_quantity_creation(self, caplog): - value = self.kwargs["non_int_type"]("4.2") for args in ( @@ -733,7 +731,6 @@ class _TestQuantityBasicMath(NonIntTypeTestCase): # self._test_quantity_ifloordiv(unit, ifunc) def test_quantity_abs_round(self): - value = self.kwargs["non_int_type"]("4.2") x = self.Q_(-value, "meter") y = self.Q_(value, "meter") @@ -1135,7 +1132,7 @@ class _TestOffsetUnitMath(NonIntTypeTestCase): in1, in2 = input_tuple if type(in1) is tuple and type(in2) is tuple: in1, in2 = self.QP_(*in1), self.QP_(*in2) - elif not type(in1) is tuple and type(in2) is tuple: + elif type(in1) is not tuple and type(in2) is tuple: in1, in2 = self.kwargs["non_int_type"](in1), self.QP_(*in2) else: in1, in2 = self.QP_(*in1), self.kwargs["non_int_type"](in2) @@ -1156,48 +1153,39 @@ class _TestOffsetUnitMath(NonIntTypeTestCase): class TestNonIntTypeQuantityFloat(_TestBasic): - kwargs = dict(non_int_type=float) SUPPORTS_NAN = True class TestNonIntTypeQuantityBasicMathFloat(_TestQuantityBasicMath): - kwargs = dict(non_int_type=float) class TestNonIntTypeOffsetUnitMathFloat(_TestOffsetUnitMath): - kwargs = dict(non_int_type=float) class TestNonIntTypeQuantityDecimal(_TestBasic): - kwargs = dict(non_int_type=Decimal) SUPPORTS_NAN = True class TestNonIntTypeQuantityBasicMathDecimal(_TestQuantityBasicMath): - kwargs = dict(non_int_type=Decimal) class TestNonIntTypeOffsetUnitMathDecimal(_TestOffsetUnitMath): - kwargs = dict(non_int_type=Decimal) class TestNonIntTypeQuantityFraction(_TestBasic): - kwargs = dict(non_int_type=Fraction) SUPPORTS_NAN = False class TestNonIntTypeQuantityBasicMathFraction(_TestQuantityBasicMath): - kwargs = dict(non_int_type=Fraction) class TestNonIntTypeOffsetUnitMathFraction(_TestOffsetUnitMath): - kwargs = dict(non_int_type=Fraction) diff --git a/pint/testsuite/test_numpy.py b/pint/testsuite/test_numpy.py index f0f95bc..080c60a 100644 --- a/pint/testsuite/test_numpy.py +++ b/pint/testsuite/test_numpy.py @@ -222,7 +222,6 @@ class TestNumpyArrayManipulation(TestNumpyMethods): def test_block_column_stack(self, subtests): for func in (np.block, np.column_stack): with subtests.test(func=func): - helpers.assert_quantity_equal( func([self.q[:, 0], self.q[:, 1]]), self.Q_(func([self.q[:, 0].m, self.q[:, 1].m]), self.ureg.m), diff --git a/pint/testsuite/test_pitheorem.py b/pint/testsuite/test_pitheorem.py index a495882..9893f50 100644 --- a/pint/testsuite/test_pitheorem.py +++ b/pint/testsuite/test_pitheorem.py @@ -8,7 +8,6 @@ from pint.testsuite import QuantityTestCase # TODO: do not subclass from QuantityTestCase class TestPiTheorem(QuantityTestCase): def test_simple(self, caplog): - # simple movement with caplog.at_level(logging.DEBUG): assert pi_theorem({"V": "m/s", "T": "s", "L": "m"}) == [ diff --git a/pint/testsuite/test_quantity.py b/pint/testsuite/test_quantity.py index 6da4f34..28b5219 100644 --- a/pint/testsuite/test_quantity.py +++ b/pint/testsuite/test_quantity.py @@ -29,7 +29,6 @@ class FakeWrapper: # TODO: do not subclass from QuantityTestCase class TestQuantity(QuantityTestCase): - kwargs = dict(autoconvert_offset_to_baseunit=False) def test_quantity_creation(self, caplog): @@ -372,7 +371,6 @@ class TestQuantity(QuantityTestCase): @helpers.requires_numpy def test_convert_numpy(self): - # Conversions with single units take a different codepath than # Conversions with more than one unit. src_dst1 = UnitsContainer(meter=1), UnitsContainer(inch=1) @@ -1000,7 +998,6 @@ class TestQuantityBasicMath(QuantityTestCase): self._test_numeric(np.ones((1, 3)), self._test_inplace) def test_quantity_abs_round(self): - x = self.Q_(-4.2, "meter") y = self.Q_(4.2, "meter") @@ -1152,14 +1149,14 @@ class TestDimensions(QuantityTestCase): def test_inclusion(self): dim = self.Q_(42, "meter").dimensionality assert "[length]" in dim - assert not ("[time]" in dim) + assert "[time]" not in dim dim = (self.Q_(42, "meter") / self.Q_(11, "second")).dimensionality assert "[length]" in dim assert "[time]" in dim dim = self.Q_(20.785, "J/(mol)").dimensionality for dimension in ("[length]", "[mass]", "[substance]", "[time]"): assert dimension in dim - assert not ("[angle]" in dim) + assert "[angle]" not in dim class TestQuantityWithDefaultRegistry(TestQuantity): @@ -1656,7 +1653,7 @@ class TestOffsetUnitMath(QuantityTestCase): in1, in2 = input_tuple if type(in1) is tuple and type(in2) is tuple: in1, in2 = self.Q_(*in1), self.Q_(*in2) - elif not type(in1) is tuple and type(in2) is tuple: + elif type(in1) is not tuple and type(in2) is tuple: in2 = self.Q_(*in2) else: in1 = self.Q_(*in1) @@ -1696,7 +1693,7 @@ class TestOffsetUnitMath(QuantityTestCase): (q1v, q1u), (q2v, q2u) = in1, in2 in1 = self.Q_(*(np.array([q1v] * 2, dtype=float), q1u)) in2 = self.Q_(q2v, q2u) - elif not type(in1) is tuple and type(in2) is tuple: + elif type(in1) is not tuple and type(in2) is tuple: in2 = self.Q_(*in2) else: in1 = self.Q_(*in1) diff --git a/pint/testsuite/test_unit.py b/pint/testsuite/test_unit.py index 536524a..ee1a5ee 100644 --- a/pint/testsuite/test_unit.py +++ b/pint/testsuite/test_unit.py @@ -212,7 +212,6 @@ class TestUnit(QuantityTestCase): assert not (self.U_("byte") != self.U_("byte")) def test_unit_cmp(self): - x = self.U_("m") assert x < self.U_("km") assert x > self.U_("mm") @@ -222,17 +221,14 @@ class TestUnit(QuantityTestCase): assert y < 1e6 def test_dimensionality(self): - x = self.U_("m") assert x.dimensionality == UnitsContainer({"[length]": 1}) def test_dimensionless(self): - assert self.U_("m/mm").dimensionless assert not self.U_("m").dimensionless def test_unit_casting(self): - assert int(self.U_("m/mm")) == 1000 assert float(self.U_("mm/m")) == 1e-3 assert complex(self.U_("mm/mm")) == 1 + 0j @@ -571,7 +567,6 @@ class TestRegistry(QuantityTestCase): assert h3(3, 1) == (3, 1) def test_wrap_referencing(self): - ureg = self.ureg def gfunc(x, y): @@ -782,7 +777,6 @@ class TestRegistry(QuantityTestCase): class TestCaseInsensitiveRegistry(QuantityTestCase): - kwargs = dict(case_sensitive=False) def test_case_sensitivity(self): @@ -824,7 +818,6 @@ class TestCompatibleUnits(QuantityTestCase): self._test(self.ureg.kelvin) def test_context_sp(self): - gd = self.ureg.get_dimensionality # length, frequency, energy @@ -899,7 +892,6 @@ class TestRegistryWithDefaultRegistry(TestRegistry): # TODO: remove QuantityTestCase class TestConvertWithOffset(QuantityTestCase): - # The dicts in convert_with_offset are used to create a UnitsContainer. # We create UnitsContainer to avoid any auto-conversion of units. convert_with_offset = [ diff --git a/pint/testsuite/test_util.py b/pint/testsuite/test_util.py index d2eebe5..fd6494a 100644 --- a/pint/testsuite/test_util.py +++ b/pint/testsuite/test_util.py @@ -305,7 +305,6 @@ class TestGraph: class TestMatrix: def test_matrix_to_string(self): - assert ( matrix_to_string([[1, 2], [3, 4]], row_headers=None, col_headers=None) == "1\t2\n" @@ -346,13 +345,11 @@ class TestMatrix: ) def test_transpose(self): - assert transpose([[1, 2], [3, 4]]) == [[1, 3], [2, 4]] class TestOtherUtils: def test_iterable(self): - # Test with list, string, generator, and scalar assert iterable([0, 1, 2, 3]) assert iterable("test") @@ -360,7 +357,6 @@ class TestOtherUtils: assert not iterable(0) def test_sized(self): - # Test with list, string, generator, and scalar assert sized([0, 1, 2, 3]) assert sized("test") diff --git a/pint/util.py b/pint/util.py index e5520b8..f925a01 100644 --- a/pint/util.py +++ b/pint/util.py @@ -571,7 +571,6 @@ class ParserHelper(UnitsContainer): @classmethod def eval_token(cls, token, use_decimal=False, non_int_type=float): - # TODO: remove this code when use_decimal is deprecated if use_decimal: raise DeprecationWarning( |