Merge branch 'master' into develop-new

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 *

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

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
 

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
+        return fIn

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.

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
 

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,

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

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