Merge pull request #136 from NREL/doc-update-and-pydantic-bump

Doc update and pydantic bump
NREL · Mar 12, 2024 · c459d5a · c459d5a
2 parents f71af54 + 56b6678
commit c459d5a
Show file tree

Hide file tree

Showing 372 changed files with 14,529 additions and 14,926 deletions.
diff --git a/.github/workflows/pull_request_tests.yml b/.github/workflows/pull_request_tests.yml
@@ -9,7 +9,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest]
           #os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.7", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11"]
 
     steps:
     - uses: actions/checkout@v2

diff --git a/PyDSS/ProfileManager/hooks/h5.py b/PyDSS/ProfileManager/hooks/h5.py
@@ -44,7 +44,7 @@ def setup_profiles(self):
                             **self.kwargs
                         )
                     else:
-                        self.logger.warning("Group {} \ data set {} not found in the h5 store".format(
+                        self.logger.warning("Group {} / data set {} not found in the h5 store".format(
                             group, profileName
                         ))
             else:

diff --git a/PyDSS/__init__.py b/PyDSS/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "3.0.2"
+__version__ = "3.0.3"
 
 
 from PyDSS.utils.timing_utils import timer_stats_collector

diff --git a/PyDSS/api/server.py b/PyDSS/api/server.py
@@ -1,7 +1,7 @@
 from PyDSS.api.src.web.handler import Handler
 import PyDSS.api.schema as schema
-#from aiohttp_swagger3 import *
-#from aiohttp import web
+from aiohttp_swagger3 import *
+from aiohttp import web
 import threading
 import requests
 import logging

diff --git a/PyDSS/api/src/app/DataWriter.py b/PyDSS/api/src/app/DataWriter.py
@@ -1,10 +1,8 @@
-from PyDSS.api.src.app.arrow_writer import ArrowWriter
 from PyDSS.api.src.app.HDF5 import hdf5Writer
 from PyDSS.api.src.app.JSON_writer import JSONwriter
 
 class DataWriter:
     modes = {
-        'arrow': ArrowWriter,
         'h5': hdf5Writer,
         'json': JSONwriter,
         # 'parquet': parquetWriter,

diff --git a/PyDSS/api/src/app/arrow_writer.py b/PyDSS/api/src/app/arrow_writer.py
diff --git a/PyDSS/api/src/app/pydss.py b/PyDSS/api/src/app/pydss.py
@@ -5,7 +5,6 @@
 from queue import Empty
 from PyDSS.dssInstance import OpenDSS
 from PyDSS.api.src.web.parser import restructure_dictionary
-# from PyDSS.api.src.app.arrow_writer import ArrowWriter
 from PyDSS.api.src.app.JSON_writer import JSONwriter
 from PyDSS.simulation_input_models import SimulationSettingsModel
 

diff --git a/PyDSS/api/src/web/handler.py b/PyDSS/api/src/web/handler.py
@@ -4,7 +4,7 @@
 import shutil
 import asyncio
 from uuid import uuid4
-#from aiohttp import web
+from aiohttp import web
 from PyDSS.api.src.app.pydss import PyDSS
 from multiprocessing import Queue, Process, Event, cpu_count
 from concurrent.futures import ThreadPoolExecutor