From: Roland Mas Date: Tue, 22 Apr 2025 15:45:39 +0200 Subject: Port to current pint --- libpyvinyl/Parameters/Collections.py | 5 +++-- libpyvinyl/Parameters/Parameter.py | 4 ++-- tests/unit/test_Parameters.py | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/libpyvinyl/Parameters/Collections.py b/libpyvinyl/Parameters/Collections.py index 78ada2e..e1abe21 100644 --- a/libpyvinyl/Parameters/Collections.py +++ b/libpyvinyl/Parameters/Collections.py @@ -6,8 +6,9 @@ import copy from libpyvinyl.AbstractBaseClass import AbstractBaseClass from .Parameter import Parameter -from pint.quantity import Quantity -from pint.unit import Unit, UnitsContainer +from pint import Quantity +from pint import Unit +from pint.util import UnitsContainer from typing import Union diff --git a/libpyvinyl/Parameters/Parameter.py b/libpyvinyl/Parameters/Parameter.py index 43c102b..c1d1758 100644 --- a/libpyvinyl/Parameters/Parameter.py +++ b/libpyvinyl/Parameters/Parameter.py @@ -5,8 +5,8 @@ import math import numpy from libpyvinyl.AbstractBaseClass import AbstractBaseClass -from pint.unit import Unit -from pint.quantity import Quantity +from pint import Unit +from pint import Quantity import pint.errors # typing diff --git a/tests/unit/test_Parameters.py b/tests/unit/test_Parameters.py index 3e5ddff..69a2f95 100644 --- a/tests/unit/test_Parameters.py +++ b/tests/unit/test_Parameters.py @@ -3,8 +3,8 @@ import numpy import pytest import os import tempfile -from pint.quantity import Quantity -from pint.unit import Unit +from pint import Quantity +from pint import Unit from libpyvinyl.Parameters import Parameter from libpyvinyl.Parameters import CalculatorParameters from libpyvinyl.Parameters import InstrumentParameters