Skip to content

Commit

Permalink
Merge branch 'main' into jd/pf_integration
Browse files Browse the repository at this point in the history
  • Loading branch information
GabrielKS committed Aug 19, 2024
2 parents c11f4cf + 4218c87 commit 4fcfa16
Show file tree
Hide file tree
Showing 143 changed files with 9,460 additions and 4,380 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
env:
PYTHON: ""
- uses: julia-actions/julia-processcoverage@v1
- uses: codecov/codecov-action@v1
- uses: codecov/codecov-action@v4
with:
file: ./lcov.info
flags: unittests
Expand Down
16 changes: 16 additions & 0 deletions .github/workflows/performance_comparison.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,14 @@ jobs:
body="${body//$'\n'/'%0A'}"
body="${body//$'\r'/'%0D'}"
echo "::set-output name=body::$body"
- name: Read solve results
id: solve_results
run: |
body="$(cat solve_time.txt)"
body="${body//'%'/'%25'}"
body="${body//$'\n'/'%0A'}"
body="${body//$'\r'/'%0D'}"
echo "::set-output name=body::$body"
- name: Find Comment
uses: peter-evans/find-comment@v1
id: fc
Expand All @@ -54,6 +62,10 @@ jobs:
| Version | Build Time |
| :--- | :----: |
${{ steps.build_results.outputs.body }}
| Version | Solve Time |
| :--- | :----: |
${{ steps.solve_results.outputs.body }}
- name: Update comment
if: steps.fc.outputs.comment-id != ''
uses: peter-evans/create-or-update-comment@v1
Expand All @@ -69,4 +81,8 @@ jobs:
| :--- | :----: |
${{ steps.build_results.outputs.body }}
| Version | Build Time |
| :--- | :----: |
${{ steps.solve_results.outputs.body }}
edit-mode: replace
2 changes: 1 addition & 1 deletion .github/workflows/pr_testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
env:
PYTHON: ""
- uses: julia-actions/julia-processcoverage@v1
- uses: codecov/codecov-action@v1
- uses: codecov/codecov-action@v4
with:
file: ./lcov.info
flags: unittests
Expand Down
10 changes: 4 additions & 6 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "PowerSimulations"
uuid = "e690365d-45e2-57bb-ac84-44ba829e73c4"
authors = ["Jose Daniel Lara", "Clayton Barrows", "Daniel Thom", "Dheepak Krishnamurthy", "Sourabh Dalvi"]
version = "0.27.4"
version = "0.28.3"

[deps]
CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
Expand All @@ -25,7 +25,6 @@ PowerNetworkMatrices = "bed98974-b02a-5e2f-9fe0-a103f5c450dd"
PowerSystems = "bcd98974-b02a-5e2f-9ee0-a103f5c450dd"
PrettyTables = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d"
ProgressMeter = "92933f4c-e287-5a05-a399-4b506db050ca"
SHA = "ea8e919c-243c-51af-8825-aaa63cd721ce"
Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
TimeSeries = "9e3dc215-6440-5c97-bce1-76c03772f85e"
TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
Expand All @@ -38,7 +37,7 @@ Dates = "1"
Distributed = "1"
DocStringExtensions = "~v0.9"
HDF5 = "~0.17"
InfrastructureSystems = "^1.21"
InfrastructureSystems = "2"
InteractiveUtils = "1"
JSON = "0.21"
JSON3 = "1"
Expand All @@ -47,12 +46,11 @@ LinearAlgebra = "1"
Logging = "1"
MathOptInterface = "1"
PowerModels = "^0.21"
PowerNetworkMatrices = "^0.10"
PowerNetworkMatrices = "^0.11"
PowerFlows = "0.7"
PowerSystems = "^3"
PowerSystems = "4"
PrettyTables = "2"
ProgressMeter = "^1.5"
SHA = "0.7"
Serialization = "1"
TimeSeries = "~0.23, ~0.24"
TimerOutputs = "~0.5"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[![Documentation](https://github.com/NREL-Sienna/PowerSimulations.jl/workflows/Documentation/badge.svg)](https://nrel-sienna.github.io/PowerSimulations.jl/latest)
[![DOI](https://zenodo.org/badge/109443246.svg)](https://zenodo.org/badge/latestdoi/109443246)
[<img src="https://img.shields.io/badge/slack-@Sienna/PSI-sienna.svg?logo=slack">](https://join.slack.com/t/nrel-sienna/shared_invite/zt-glam9vdu-o8A9TwZTZqqNTKHa7q3BpQ)
[![PowerSimulations Downloads](https://shields.io/endpoint?url=https://pkgs.genieframework.com/api/v1/badge/PowerSimulations)](https://pkgs.genieframework.com?packages=PowerSimulations)
[![PowerSimulations.jl Downloads](https://img.shields.io/badge/dynamic/json?url=http%3A%2F%2Fjuliapkgstats.com%2Fapi%2Fv1%2Ftotal_downloads%2FPowerSimulations&query=total_requests&label=Downloads)](http://juliapkgstats.com/pkg/PowerSimulations)

`PowerSimulations.jl` is a Julia package for power system modeling and simulation of Power Systems operations. The objectives of the package are:

Expand Down
3 changes: 2 additions & 1 deletion docs/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@ TimeSeries = "9e3dc215-6440-5c97-bce1-76c03772f85e"

[compat]
Documenter = "0.27"
InfrastructureSystems = "1"
InfrastructureSystems = "2"
julia = "^1.6"
Latexify = "=0.16.3"
8 changes: 6 additions & 2 deletions docs/make.jl
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ pages = OrderedDict(
"modeler_guide/psi_structure.md",
"modeler_guide/problem_templates.md",
"modeler_guide/running_a_simulation.md",
"modeler_guide/read_results.md",
"modeler_guide/simulation_recorder.md",
"modeler_guide/logging.md",
"modeler_guide/tips_and_tricks.md",
"modeler_guide/debugging_infeasible_models.md",
"modeler_guide/parallel_simulations.md",
"modeler_guide/modeling_faq.md",
Expand All @@ -31,12 +31,16 @@ pages = OrderedDict(
"Troubleshooting" => "code_base_developer_guide/troubleshooting.md",
],
"Formulation Library" => Any[
"Introduction" => "formulation_library/Introduction.md",
"General" => "formulation_library/General.md",
"Network" => "formulation_library/Network.md",
"Thermal Generation" => "formulation_library/ThermalGen.md",
"Renewable Generation" => "formulation_library/RenewableGen.md",
"Load" => "formulation_library/Load.md",
"Network" => "formulation_library/Network.md",
"Branch" => "formulation_library/Branch.md",
"Services" => "formulation_library/Service.md",
"Feedforwards" => "formulation_library/Feedforward.md",
"Piecewise Linear Cost" => "formulation_library/Piecewise.md",
],
"API Reference" => "api/PowerSimulations.md",
)
Expand Down
Loading

0 comments on commit 4fcfa16

Please sign in to comment.