From 70f28ea98087f07a31f54cae9aece6d1e20974a5 Mon Sep 17 00:00:00 2001 From: Srihari Sundar Date: Fri, 17 Oct 2025 13:32:32 -0600 Subject: [PATCH 1/6] Add docs announcement, update local docs building instructions --- docs/README.md | 4 ++-- docs/serve.jl | 11 ++++++----- docs/src/index.md | 7 +++++++ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/docs/README.md b/docs/README.md index 84be7859..dcc358d2 100644 --- a/docs/README.md +++ b/docs/README.md @@ -4,9 +4,9 @@ These are some steps to follow when making changes to documentation. 1. Checkout a new branch from `main` (e.g. `git checkout -b docupdate`). 2. Instantiate the environment in the `docs` folder by running `] instantiate` in the Julia REPL. 3. Make changes to the documentation files in the `docs` folder and/or the example scripts in the `examples` folder. -4. You can iteratively make changes and build documentation to serve locally by running the `serve.jl` script in the `docs` folder by running +4. You can iteratively make changes and build documentation to serve locally by running the `serve.jl` script from the `docs` folder using this command ```bash - julia --project=. serve.jl --threads auto + julia --project=. -e "using Pkg; Pkg.add(\"LiveServer\"); include(\"serve.jl\")" --threads auto ``` 5. Once you push to origin (github.com/NREL/PRAS) and create a pull request, the documentation will be built and served at https://nrel.github.io/PRAS/previews/PR{#}. Once the changes are merged to `main`, the documentation will be available at https://nrel.github.io/PRAS/dev. On tagging a PRAS version for release, the documentation will be available at https://nrel.github.io/PRAS/stable and https://nrel.github.io/PRAS/vX.Y.Z (where X.Y.Z is the version number). 6. More instructions on version tagging and release can be found in the [Documenter.jl](https://documenter.juliadocs.org/stable/man/hosting/#Documentation-Versions) instructions. \ No newline at end of file diff --git a/docs/serve.jl b/docs/serve.jl index ff4cc908..72d629af 100644 --- a/docs/serve.jl +++ b/docs/serve.jl @@ -2,11 +2,12 @@ using LiveServer using Pkg # Develop all packages -for pkg in ["PRASCore.jl", "PRASFiles.jl", "PRASCapacityCredits.jl"] - pkg_path = joinpath("..", pkg) - isdir(pkg_path) || continue - Pkg.develop(PackageSpec(path=pkg_path)) -end +Pkg.develop([ + (path="../PRASCore.jl",), + (path="../PRASFiles.jl",), + (path="../PRASCapacityCredits.jl",), + (path="../PRAS.jl",) +]) # Build docs include("make.jl") diff --git a/docs/src/index.md b/docs/src/index.md index 0c0f515d..b2b8eeec 100644 --- a/docs/src/index.md +++ b/docs/src/index.md @@ -1,5 +1,12 @@ # PRAS +!!! note "Announcement" + PRAS v0.8.0 was released in October 2025, and it includes the capability to + model shift and shed type demand reponse devices. If you need these + capabilities, be sure to increment PRAS version in your projects. There are no + breaking changes with this release, and your old workflows will also work + as is. + The Probabilistic Resource Adequacy Suite (PRAS) provides an open-source, research-oriented collection of tools for analysing the [resource adequacy](@ref resourceadequacy) of a bulk power system. It allows the user to simulate power system operations under a wide range of operating conditions in order to study the risk of failing to meet demand (due to a lack of supply or deliverability), and identify the time periods and regions in which that risk occurs. It offers high-performance sequential Monte Carlo methods supporting multi-region composite reliability assessment, including simulation of energy-limited resources such as storage. From 82b95e0393000a3b074118fdbf271dcd767ced58 Mon Sep 17 00:00:00 2001 From: Srihari Sundar Date: Fri, 17 Oct 2025 13:38:15 -0600 Subject: [PATCH 2/6] Update actions to cancel previous runs in the same workflow if new one is triggered --- .github/workflows/PRAS.jl.yml | 5 +++++ .github/workflows/PRASCapacityCredits.jl.yml | 5 +++++ .github/workflows/PRASCore.jl.yml | 5 +++++ .github/workflows/PRASFiles.jl.yml | 5 +++++ .github/workflows/docs.yml | 4 ++++ 5 files changed, 24 insertions(+) diff --git a/.github/workflows/PRAS.jl.yml b/.github/workflows/PRAS.jl.yml index 2c52e261..97d79902 100644 --- a/.github/workflows/PRAS.jl.yml +++ b/.github/workflows/PRAS.jl.yml @@ -7,6 +7,11 @@ on: branches: [main] tags: ["*"] pull_request: + +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: test: name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} diff --git a/.github/workflows/PRASCapacityCredits.jl.yml b/.github/workflows/PRASCapacityCredits.jl.yml index 758233da..10302774 100644 --- a/.github/workflows/PRASCapacityCredits.jl.yml +++ b/.github/workflows/PRASCapacityCredits.jl.yml @@ -7,6 +7,11 @@ on: branches: [main] tags: ["*"] pull_request: + +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: test: name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} diff --git a/.github/workflows/PRASCore.jl.yml b/.github/workflows/PRASCore.jl.yml index ced28356..e10a130e 100644 --- a/.github/workflows/PRASCore.jl.yml +++ b/.github/workflows/PRASCore.jl.yml @@ -7,6 +7,11 @@ on: branches: [main] tags: ["*"] pull_request: + +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: test: name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} diff --git a/.github/workflows/PRASFiles.jl.yml b/.github/workflows/PRASFiles.jl.yml index bd0c2a80..c03a3169 100644 --- a/.github/workflows/PRASFiles.jl.yml +++ b/.github/workflows/PRASFiles.jl.yml @@ -7,6 +7,11 @@ on: branches: [main] tags: ["*"] pull_request: + +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: test: name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index e94c4723..6617458a 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -7,6 +7,10 @@ on: tags: '*' pull_request: +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: docs: name: Documentation From 5a4a25765db78e5358d73f5c3bc282ef7417574a Mon Sep 17 00:00:00 2001 From: Srihari Sundar Date: Fri, 17 Oct 2025 14:04:26 -0600 Subject: [PATCH 3/6] Update actions to cancel previous runs in the same workflow if new one is triggered --- .github/workflows/PRAS.jl.yml | 7 +++---- .github/workflows/PRASCapacityCredits.jl.yml | 7 +++---- .github/workflows/PRASCore.jl.yml | 7 +++---- .github/workflows/PRASFiles.jl.yml | 7 +++---- .github/workflows/docs.yml | 7 +++---- 5 files changed, 15 insertions(+), 20 deletions(-) diff --git a/.github/workflows/PRAS.jl.yml b/.github/workflows/PRAS.jl.yml index 97d79902..80cfa690 100644 --- a/.github/workflows/PRAS.jl.yml +++ b/.github/workflows/PRAS.jl.yml @@ -7,14 +7,13 @@ on: branches: [main] tags: ["*"] pull_request: - -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true jobs: test: name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} + concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true runs-on: ${{ matrix.os }} strategy: fail-fast: false diff --git a/.github/workflows/PRASCapacityCredits.jl.yml b/.github/workflows/PRASCapacityCredits.jl.yml index 10302774..e9581d33 100644 --- a/.github/workflows/PRASCapacityCredits.jl.yml +++ b/.github/workflows/PRASCapacityCredits.jl.yml @@ -8,13 +8,12 @@ on: tags: ["*"] pull_request: -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true - jobs: test: name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} + concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true runs-on: ${{ matrix.os }} strategy: fail-fast: false diff --git a/.github/workflows/PRASCore.jl.yml b/.github/workflows/PRASCore.jl.yml index e10a130e..d6955f7d 100644 --- a/.github/workflows/PRASCore.jl.yml +++ b/.github/workflows/PRASCore.jl.yml @@ -8,13 +8,12 @@ on: tags: ["*"] pull_request: -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true - jobs: test: name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} + concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true runs-on: ${{ matrix.os }} strategy: fail-fast: false diff --git a/.github/workflows/PRASFiles.jl.yml b/.github/workflows/PRASFiles.jl.yml index c03a3169..d866516a 100644 --- a/.github/workflows/PRASFiles.jl.yml +++ b/.github/workflows/PRASFiles.jl.yml @@ -8,13 +8,12 @@ on: tags: ["*"] pull_request: -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true - jobs: test: name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} + concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true runs-on: ${{ matrix.os }} strategy: fail-fast: false diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 6617458a..81411383 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -7,13 +7,12 @@ on: tags: '*' pull_request: -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true - jobs: docs: name: Documentation + concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true runs-on: macOS-latest permissions: contents: write From 6bed7c141dc3b878d13f53eea52ae795b266d6ac Mon Sep 17 00:00:00 2001 From: Srihari Sundar Date: Fri, 17 Oct 2025 14:08:04 -0600 Subject: [PATCH 4/6] Bump cap credit version --- PRASCapacityCredits.jl/Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PRASCapacityCredits.jl/Project.toml b/PRASCapacityCredits.jl/Project.toml index 6c502a6f..4e8da397 100644 --- a/PRASCapacityCredits.jl/Project.toml +++ b/PRASCapacityCredits.jl/Project.toml @@ -1,7 +1,7 @@ name = "PRASCapacityCredits" uuid = "2e1a2ed5-e89d-4cd3-bc86-c0e88a73d3a3" authors = ["Gord Stephen "] -version = "0.7.0" +version = "0.8.0" [deps] Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f" From 1d73c36b7c9a14da58ecccc4961dfc7632921d33 Mon Sep 17 00:00:00 2001 From: Srihari Sundar Date: Fri, 17 Oct 2025 14:13:43 -0600 Subject: [PATCH 5/6] Update actions to cancel previous runs in the same workflow if new one is triggered --- .github/workflows/PRAS.jl.yml | 2 +- .github/workflows/PRASCapacityCredits.jl.yml | 2 +- .github/workflows/PRASCore.jl.yml | 2 +- .github/workflows/PRASFiles.jl.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/PRAS.jl.yml b/.github/workflows/PRAS.jl.yml index 80cfa690..5f8aa533 100644 --- a/.github/workflows/PRAS.jl.yml +++ b/.github/workflows/PRAS.jl.yml @@ -12,7 +12,7 @@ jobs: test: name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} cancel-in-progress: true runs-on: ${{ matrix.os }} strategy: diff --git a/.github/workflows/PRASCapacityCredits.jl.yml b/.github/workflows/PRASCapacityCredits.jl.yml index e9581d33..3f49c778 100644 --- a/.github/workflows/PRASCapacityCredits.jl.yml +++ b/.github/workflows/PRASCapacityCredits.jl.yml @@ -12,7 +12,7 @@ jobs: test: name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} cancel-in-progress: true runs-on: ${{ matrix.os }} strategy: diff --git a/.github/workflows/PRASCore.jl.yml b/.github/workflows/PRASCore.jl.yml index d6955f7d..464a78eb 100644 --- a/.github/workflows/PRASCore.jl.yml +++ b/.github/workflows/PRASCore.jl.yml @@ -12,7 +12,7 @@ jobs: test: name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} cancel-in-progress: true runs-on: ${{ matrix.os }} strategy: diff --git a/.github/workflows/PRASFiles.jl.yml b/.github/workflows/PRASFiles.jl.yml index d866516a..bfe05eb4 100644 --- a/.github/workflows/PRASFiles.jl.yml +++ b/.github/workflows/PRASFiles.jl.yml @@ -12,7 +12,7 @@ jobs: test: name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + group: ${{ github.workflow }} - ${{ github.event.pull_request.number || github.ref }} - ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} cancel-in-progress: true runs-on: ${{ matrix.os }} strategy: From ad6999f211922bdf7843dd4d25e28c93a8e7e30b Mon Sep 17 00:00:00 2001 From: Srihari Sundar Date: Fri, 17 Oct 2025 14:14:58 -0600 Subject: [PATCH 6/6] Change Hari name --- PRAS.jl/Project.toml | 4 ++-- PRASCore.jl/Project.toml | 2 +- PRASFiles.jl/Project.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/PRAS.jl/Project.toml b/PRAS.jl/Project.toml index d15aeeaf..7d37933b 100644 --- a/PRAS.jl/Project.toml +++ b/PRAS.jl/Project.toml @@ -3,7 +3,7 @@ uuid = "05348d26-1c52-11e9-35e3-9d51842d34b9" authors = [ "Gord Stephen ", "Surya Chandan Dhulipala ", - "Hari Sundar ", + "Srihari Sundar ", "Julian Florez ", "Surya Chandan Dhulipala ", - "Hari Sundar ", + "Srihari Sundar ", "Julian Florez ", "Surya Chandan Dhulipala ", - "Hari Sundar ", + "Srihari Sundar ", "Julian Florez