diff --git a/PyDSS/__init__.py b/PyDSS/__init__.py index bed97e9b..48733929 100644 --- a/PyDSS/__init__.py +++ b/PyDSS/__init__.py @@ -1,4 +1,5 @@ -__version__ = "2.3.1" +__version__ = "3.0.1" + from PyDSS.utils.timing_utils import timer_stats_collector from . import * diff --git a/PyDSS/controllers.py b/PyDSS/controllers.py index 8fb8b7f8..8b94da55 100644 --- a/PyDSS/controllers.py +++ b/PyDSS/controllers.py @@ -7,7 +7,7 @@ from typing import Optional, List, Union import opendssdirect as dss -from pydantic import BaseModel, Field, validator +from pydantic.v1 import BaseModel, Field from PyDSS.SolveMode import get_solver_from_simulation_type from PyDSS.common import SimulationType diff --git a/PyDSS/node_voltage_metrics.py b/PyDSS/node_voltage_metrics.py index 36a52bb7..214900ef 100644 --- a/PyDSS/node_voltage_metrics.py +++ b/PyDSS/node_voltage_metrics.py @@ -3,7 +3,7 @@ from pathlib import Path from typing import Dict, List, Union -from pydantic import BaseModel, Field +from pydantic.v1 import BaseModel, Field from PyDSS.utils.simulation_utils import CircularBufferHelper diff --git a/PyDSS/pyControllers/Controllers/PvFrequencyRideThru.py b/PyDSS/pyControllers/Controllers/PvFrequencyRideThru.py index 7190f911..7b3d43d3 100644 --- a/PyDSS/pyControllers/Controllers/PvFrequencyRideThru.py +++ b/PyDSS/pyControllers/Controllers/PvFrequencyRideThru.py @@ -6,7 +6,6 @@ import datetime import math import os -from pydantic import BaseModel, validator, conint, confloat import pdb class PvFrequencyRideThru(ControllerAbstract): @@ -462,4 +461,4 @@ def __UpdateViolatonTimers(self): self.__fViolationtime = (self.__dssSolver.GetDateTime() - self.__fViolationstartTime).total_seconds() - return fIn \ No newline at end of file + return fIn diff --git a/PyDSS/pyControllers/Controllers/PvVoltageRideThru.py b/PyDSS/pyControllers/Controllers/PvVoltageRideThru.py index 6436d613..14702e4e 100644 --- a/PyDSS/pyControllers/Controllers/PvVoltageRideThru.py +++ b/PyDSS/pyControllers/Controllers/PvVoltageRideThru.py @@ -4,7 +4,6 @@ import datetime import math import os -from pydantic import BaseModel, validator, conint, confloat class PvVoltageRideThru(ControllerAbstract): """Implementation of IEEE1547-2003 and IEEE1547-2018 voltage ride-through standards using the OpenDSS Generator model. Subclass of the :class:`PyDSS.pyControllers.pyControllerAbstract.ControllerAbstract` abstract class. diff --git a/PyDSS/reports/feeder_losses.py b/PyDSS/reports/feeder_losses.py index 0d7f0cea..22bd89d5 100644 --- a/PyDSS/reports/feeder_losses.py +++ b/PyDSS/reports/feeder_losses.py @@ -5,7 +5,7 @@ from datetime import timedelta from typing import Dict -from pydantic import BaseModel, Field +from pydantic.v1 import BaseModel, Field from PyDSS.reports.reports import ReportBase diff --git a/PyDSS/simulation_input_models.py b/PyDSS/simulation_input_models.py index ea2bc922..945b8cbf 100644 --- a/PyDSS/simulation_input_models.py +++ b/PyDSS/simulation_input_models.py @@ -6,8 +6,8 @@ from pathlib import Path from typing import Any, Dict, List, Optional -from pydantic import BaseModel, Field, root_validator, validator -from pydantic.json import isoformat, timedelta_isoformat +from pydantic.v1 import BaseModel, Field, root_validator, validator +from pydantic.v1.json import isoformat, timedelta_isoformat from PyDSS.common import ( ControlMode, diff --git a/PyDSS/thermal_metrics.py b/PyDSS/thermal_metrics.py index 6d6b0041..84697aa8 100644 --- a/PyDSS/thermal_metrics.py +++ b/PyDSS/thermal_metrics.py @@ -6,7 +6,7 @@ from pathlib import Path from typing import Dict, List, Union -from pydantic import BaseModel, Field +from pydantic.v1 import BaseModel, Field from PyDSS.utils.simulation_utils import CircularBufferHelper from PyDSS.utils.utils import dump_data, load_data diff --git a/requirements.txt b/requirements.txt index 08eeec08..257c4c51 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,6 +16,6 @@ aiohttp~=3.8.2 aiohttp_swagger3>=0.4.3 requests pymongo -pydantic~=1.10.11 +pydantic~=2.5.2 matplotlib pvder