urbanopt-scenario 0.10.0 → 0.12.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (16) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/nightly_ci_build.yml +6 -3
  3. data/CHANGELOG.md +17 -0
  4. data/Gemfile +2 -2
  5. data/LICENSE.md +1 -1
  6. data/README.md +6 -3
  7. data/Rakefile +3 -38
  8. data/doc_templates/LICENSE.md +1 -1
  9. data/doc_templates/copyright_erb.txt +1 -1
  10. data/docs/package-lock.json +4405 -4750
  11. data/lib/urbanopt/scenario/scenario_post_processor_disco.rb +99 -108
  12. data/lib/urbanopt/scenario/scenario_post_processor_opendss.rb +22 -9
  13. data/lib/urbanopt/scenario/version.rb +1 -1
  14. data/urbanopt-scenario-gem.gemspec +5 -5
  15. metadata +12 -13
  16. data/Jenkinsfile +0 -10
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 17d3c66b7444d1685977b518d8b847c23e1bbf929e7502f11c275281f13251ed
4
- data.tar.gz: 3d3b44bf2be37d0bfa336da74a748e9b2a50304347323b973ed7f1f2ef2da8cb
3
+ metadata.gz: f57c37ca80b5720cc531f38164d66148b350ab038c826c06de5e4e74eb2f1d12
4
+ data.tar.gz: adb6a418f90e07392b33c51f65e8559ac39930f695c5e126dc0df0428e44cff6
5
5
  SHA512:
6
- metadata.gz: 270c29a556ff1aad7943637b4b075ab757ce450ddb479139eb7301543525018bf396be651b0d4676f9259945efcb5de8805fe980ea73c31a522af1ca4f4a7774
7
- data.tar.gz: 596fd345d89d0214a83cf1e5563aeac84e01e0dda25110d19f263e53cb224ad56fd527871a9cfeca5264289004f6c803fcb69e7cfc05be8dd90a46422193e74b
6
+ metadata.gz: 3c3b92bfbb9679bd2db1b55aa47db0418c669a1c293364b77732c15b817cebca5a9977b6b206841f00d43f279350260bf114905178a5bc1ccb6870f76e0dd3d8
7
+ data.tar.gz: 76c16600d3634084e0ff6011d2952ac8ed7abf4ef8573d2d97d01efd502b535fdc409c69b2d22f51b6ee3bc27349e5a580b5d37c6441b3d594b3ce453f74d89c
data/.github/workflows/nightly_ci_build.yml CHANGED
@@ -1,12 +1,15 @@
1
1
 
2
- name: nightly_build
2
+ name: Scenario-gem CI
3
3
 
4
4
  on:
5
+ workflow_dispatch:
5
6
  # push:
6
7
  schedule:
7
8
  # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule
8
9
  # 5 am UTC (11pm MDT the day before) every weekday night in MDT
9
10
  - cron: '21 5 * * 2-6'
11
+ pull_request:
12
+ types: [review_requested]
10
13
 
11
14
  env:
12
15
  # This env var should enforce develop branch of all dependencies
@@ -19,9 +22,9 @@ jobs:
19
22
  # https://github.com/rbenv/ruby-build/discussions/1940
20
23
  runs-on: ubuntu-latest
21
24
  container:
22
- image: docker://nrel/openstudio:3.6.1
25
+ image: docker://nrel/openstudio:3.7.0
23
26
  steps:
24
- - uses: actions/checkout@v3
27
+ - uses: actions/checkout@v4
25
28
  - name: Update gems
26
29
  run: bundle update
27
30
  - name: Run Rspec
data/CHANGELOG.md CHANGED
@@ -1,5 +1,22 @@
1
1
  # URBANopt Scenario Gem
2
2
 
3
+ ## Version 0.12.0
4
+ Date Range: 01/10/24 - 05/06/24
5
+ * Use new version of reporting-gem by @vtnate in https://github.com/urbanopt/urbanopt-scenario-gem/pull/271
6
+
7
+ **Full Changelog**: https://github.com/urbanopt/urbanopt-scenario-gem/compare/v0.11.0...v0.12.0
8
+
9
+ ## Version 0.11.0
10
+ Date Range: 07/06/23 - 01/10/24
11
+
12
+ * Add transformer in- and out-going voltages to reporting by @vtnate in https://github.com/urbanopt/urbanopt-scenario-gem/pull/265
13
+ * Remove jenkins by @vtnate in https://github.com/urbanopt/urbanopt-scenario-gem/pull/264
14
+ * also run CI when a PR gets a review request by @vtnate in https://github.com/urbanopt/urbanopt-scenario-gem/pull/266
15
+ * enforce using sqlite3 v1.6 because 1.7 requires ruby3 by @vtnate in https://github.com/urbanopt/urbanopt-scenario-gem/pull/269
16
+ * Support os37 for testing by @vtnate in https://github.com/urbanopt/urbanopt-scenario-gem/pull/267
17
+
18
+ **Full Changelog**: https://github.com/urbanopt/urbanopt-scenario-gem/compare/v0.10.0...v0.11.0
19
+
3
20
  ## Version 0.10.0
4
21
  Date Range: 12/5/22 - 7/6/23
5
22
 
data/Gemfile CHANGED
@@ -23,7 +23,7 @@ allow_local = ENV['FAVOR_LOCAL_GEMS']
23
23
  # if allow_local && File.exist?('../urbanopt-core-gem')
24
24
  # gem 'urbanopt-core', path: '../urbanopt-core-gem'
25
25
  # elsif allow_local
26
- # gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'develop'
26
+ # gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'os37'
27
27
  # end
28
28
 
29
29
  # if allow_local && File.exist?('../openstudio-common-measures-gem')
@@ -39,7 +39,7 @@ allow_local = ENV['FAVOR_LOCAL_GEMS']
39
39
  # end
40
40
 
41
41
  # if allow_local && File.exist?('../urbanopt-reporting-gem')
42
- # gem 'urbanopt-reporting', path: '../urbanopt-reporting-gem'
42
+ # gem 'urbanopt-reporting', path: '../urbanopt-reporting-gem'
43
43
  # elsif allow_local
44
44
  # gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'develop'
45
45
  # end
data/LICENSE.md CHANGED
@@ -1,4 +1,4 @@
1
- URBANopt (tm), Copyright (c) 2019-2023, Alliance for Sustainable Energy, LLC, and other
1
+ URBANopt (tm), Copyright (c) 2019-2024, Alliance for Sustainable Energy, LLC, and other
2
2
  contributors. All rights reserved.
3
3
 
4
4
  Redistribution and use in source and binary forms, with or without modification,
data/README.md CHANGED
@@ -1,7 +1,7 @@
1
1
  # URBANopt Scenario Gem
2
2
 
3
3
  [![Coverage Status](https://coveralls.io/repos/github/urbanopt/urbanopt-scenario-gem/badge.svg?branch=develop)](https://coveralls.io/github/urbanopt/urbanopt-scenario-gem?branch=develop)
4
- [![nightly_build](https://github.com/urbanopt/urbanopt-scenario-gem/actions/workflows/nightly_build.yml/badge.svg)](https://github.com/urbanopt/urbanopt-scenario-gem/actions/workflows/nightly_build.yml)
4
+ [![nightly_build](https://github.com/urbanopt/urbanopt-scenario-gem/actions/workflows/nightly_ci_build.yml/badge.svg)](https://github.com/urbanopt/urbanopt-scenario-gem/actions/workflows/nightly_ci_build.yml)
5
5
 
6
6
  The URBANopt™ Scenario Gem includes functionality for defining scenarios, running simulations, and post-processing results. User defined SimulationMapper classes translate each Feature to a SimulationDir which is a directory containing simulation input files. The ScenarioRunner is used to perform simulations for each SimulationDir. Finally, a ScenarioPostProcessor can run on a Scenario to generate scenario level results.
7
7
 
@@ -34,9 +34,12 @@ Check out the repository and then execute:
34
34
 
35
35
  ## Releasing
36
36
 
37
- * Update CHANGELOG.md
38
37
  * Run `rake rubocop:auto_correct`
39
38
  * Update version in `/lib/urbanopt/scenario/version.rb`
39
+ * On GitHub, go to the releases page and update the latest release tag (from develop). Name it “Version x.y.z”, set the previous tag to the appropriate value, and click the `Generate release notes` button
40
+ * Copy the text generated, which is sorted according to PR labels
41
+ * Discard the release or save as draft
42
+ * Update CHANGELOG.md appropriately, with dates and the content copied from GitHub
40
43
  * Create PR to master, after tests and reviews complete, then merge
44
+ * In GitHub, make a new release or complete the previous one, basing off master/main
41
45
  * Locally - from the master branch, run `rake release`
42
- * On GitHub, go to the releases page and update the latest release tag. Name it “Version x.y.z” and copy the CHANGELOG entry into the description box.
data/Rakefile CHANGED
@@ -1,43 +1,8 @@
1
1
  # *********************************************************************************
2
- # URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other
3
- # contributors. All rights reserved.
4
-
5
- # Redistribution and use in source and binary forms, with or without modification,
6
- # are permitted provided that the following conditions are met:
7
-
8
- # Redistributions of source code must retain the above copyright notice, this list
9
- # of conditions and the following disclaimer.
10
-
11
- # Redistributions in binary form must reproduce the above copyright notice, this
12
- # list of conditions and the following disclaimer in the documentation and/or other
13
- # materials provided with the distribution.
14
-
15
- # Neither the name of the copyright holder nor the names of its contributors may be
16
- # used to endorse or promote products derived from this software without specific
17
- # prior written permission.
18
-
19
- # Redistribution of this software, without modification, must refer to the software
20
- # by the same designation. Redistribution of a modified version of this software
21
- # (i) may not refer to the modified version by the same designation, or by any
22
- # confusingly similar designation, and (ii) must refer to the underlying software
23
- # originally provided by Alliance as “URBANopt”. Except to comply with the foregoing,
24
- # the term “URBANopt”, or any confusingly similar designation may not be used to
25
- # refer to any modified version of this software or any modified version of the
26
- # underlying software originally provided by Alliance without the prior written
27
- # consent of Alliance.
28
-
29
- # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
30
- # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
31
- # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
32
- # IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
33
- # INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
34
- # BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
35
- # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
36
- # LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
37
- # OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
38
- # OF THE POSSIBILITY OF SUCH DAMAGE.
2
+ # URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
3
+ # See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md
39
4
  # *********************************************************************************
40
- #
5
+
41
6
  require 'bundler/gem_tasks'
42
7
  require 'rspec/core/rake_task'
43
8
 
data/doc_templates/LICENSE.md CHANGED
@@ -1,4 +1,4 @@
1
- URBANopt (tm), Copyright (c) 2019-2023, Alliance for Sustainable Energy, LLC, and other
1
+ URBANopt (tm), Copyright (c) 2019-2024, Alliance for Sustainable Energy, LLC, and other
2
2
  contributors. All rights reserved.
3
3
 
4
4
  Redistribution and use in source and binary forms, with or without modification,
data/doc_templates/copyright_erb.txt CHANGED
@@ -1,6 +1,6 @@
1
1
  <%
2
2
  # *********************************************************************************
3
- # URBANopt (tm), Copyright (c) 2019-2023, Alliance for Sustainable Energy, LLC, and other
3
+ # URBANopt (tm), Copyright (c) 2019-2024, Alliance for Sustainable Energy, LLC, and other
4
4
  # contributors. All rights reserved.
5
5
 
6
6
  # Redistribution and use in source and binary forms, with or without modification,