Merge pull request #188 from NatLabRockies/upgrade-pydss

Upgrade pydss

Author: daniel-thom

.github/workflows/gh-pages.yml

@@ -8,11 +8,11 @@ jobs:
   make-pages:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: select python version
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: "3.13"
       - name: install dependencies
         run: |
           python -m pip install --upgrade pip
@@ -23,7 +23,7 @@ jobs:
           make clean
           make html
       - name: deploy
-        uses: peaceiris/actions-gh-pages@v3.6.1
+        uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./docs/build/html

.github/workflows/publish_to_pypi.yml

@@ -8,11 +8,11 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
-        python-version: 3.7
+        python-version: "3.13"
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

.github/workflows/pull_request_tests.yml

@@ -10,12 +10,12 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.9", "3.10"]
+        python-version: ["3.13"]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies

Dockerfile

@@ -35,12 +35,12 @@ RUN echo "slurm:x:989:989:SLURM workload manager:/var/lib/slurm:/bin/bash" >> /e
 RUN echo "slurm:x:989:" >> /etc/group
 
 WORKDIR /repos
-RUN git clone https://github.com/NREL/disco.git
+RUN git clone https://github.com/NatLabRockies/disco.git
 
 RUN pip install NREL-jade
 
 WORKDIR /repos
-RUN git clone https://github.com/NREL/PyDSS.git
+RUN git clone https://github.com/NatLabRockies/PyDSS.git
 WORKDIR /repos/PyDSS
 RUN git checkout report-metrics
 

disco/analysis/postprocess_time_series.py

@@ -14,10 +14,10 @@
 from jade.jobs.results_aggregator import ResultsAggregator
 from disco.extensions.pydss_simulation.pydss_configuration import PyDssConfiguration
 from disco.distribution.deployment_parameters import DeploymentParameters
-from PyDSS.thermal_metrics import create_summary_from_dict
-from PyDSS.pydss_project import PyDssProject
-from PyDSS.pydss_results import PyDssResults
-from PyDSS.node_voltage_metrics import SimulationVoltageMetricsModel, VoltageMetricsModel
+from pydss.thermal_metrics import create_summary_from_dict
+from pydss.pydss_project import PyDssProject
+from pydss.pydss_results import PyDssResults
+from pydss.node_voltage_metrics import SimulationVoltageMetricsModel, VoltageMetricsModel
 
 
 logger = logging.getLogger(__name__)

disco/analysis/snapshot_impact_analysis.py

@@ -13,7 +13,7 @@
 from jade.utils.timing_utils import track_timing, TimerStatsCollector, Timer
 from jade.utils.utils import dump_data
 
-from PyDSS.pydss_results import PyDssResults, PyDssScenarioResults
+from pydss.pydss_results import PyDssResults, PyDssScenarioResults
 from disco.analysis import Analysis, Input
 from disco.exceptions import AnalysisRunException
 from disco.extensions.pydss_simulation.pydss_configuration import PyDssConfiguration

disco/cli/compute_hosting_capacity.py

@@ -3,7 +3,7 @@
 import click
 
 from jade.utils.utils import load_data, dump_data
-from PyDSS.common import SnapshotTimePointSelectionMode
+from pydss.common import SnapshotTimePointSelectionMode
 import disco
 from disco.postprocess.hosting_capacity import compute_hc
 

disco/cli/config_generic_models.py

@@ -6,7 +6,7 @@
 from jade.loggers import setup_logging
 from jade.utils.utils import load_data
 
-from PyDSS.reports.pv_reports import PF1_SCENARIO, CONTROL_MODE_SCENARIO
+from pydss.reports.pv_reports import PF1_SCENARIO, CONTROL_MODE_SCENARIO
 
 from disco.cli.config_snapshot import (
     switch_snapshot_to_qsts,

disco/cli/config_snapshot.py

@@ -11,8 +11,8 @@
 from jade.common import CONFIG_FILE
 from jade.loggers import setup_logging
 from jade.utils.utils import load_data
-from PyDSS.common import SnapshotTimePointSelectionMode
-from PyDSS.reports.pv_reports import PF1_SCENARIO, CONTROL_MODE_SCENARIO
+from pydss.common import SnapshotTimePointSelectionMode
+from pydss.reports.pv_reports import PF1_SCENARIO, CONTROL_MODE_SCENARIO
 
 from disco.enums import SimulationType, AnalysisType
 from disco.extensions.pydss_simulation.pydss_configuration import PyDssConfiguration

disco/cli/config_time_series.py

@@ -10,7 +10,7 @@
 from jade.common import CONFIG_FILE
 from jade.loggers import setup_logging
 from jade.utils.utils import load_data
-from PyDSS.reports.pv_reports import PF1_SCENARIO, CONTROL_MODE_SCENARIO
+from pydss.reports.pv_reports import PF1_SCENARIO, CONTROL_MODE_SCENARIO
 
 from disco.enums import SimulationType
 from disco.extensions.pydss_simulation.pydss_configuration import PyDssConfiguration