Merge pull request #3 from openstudiocoalition/updates_for_1_8_0

Update with 0.10.0 measures

.github/workflows/pull_request.yml

@@ -7,16 +7,16 @@ on:
 
 jobs:
   test_351x:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - name: Check out repository
       uses: actions/checkout@v2
     - name: Run Tests
       run: |
         echo $(pwd)
         echo $(ls)
-        docker pull nrel/openstudio:3.5.1
-        docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:3.5.1
+        docker pull nrel/openstudio:3.8.0
+        docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:3.8.0
         docker exec -t test pwd
         docker exec -t test ls
         docker exec -t test bundle update

.rspec_status

@@ -1,4 +1,4 @@
 example_id                       | status | run_time               |
 -------------------------------- | ------ | ---------------------- |
-./spec/run_measures_spec.rb[1:1] | passed | 0.00007 seconds        |
-./spec/run_models_spec.rb[1:1]   | passed | 4 minutes 17.7 seconds |
+./spec/run_measures_spec.rb[1:1] | passed | 0.00013 seconds        |
+./spec/run_models_spec.rb[1:1]   | passed | 4 minutes 37.3 seconds |

Gemfile

@@ -1,3 +1,7 @@
 source "https://rubygems.org"
 
+# Gems on rubygems don't have test files and don't match contents on BCL, pull from GitHub instead
+gem 'openstudio-common-measures', github: 'NREL/openstudio-common-measures-gem', tag: 'v0.10.0'
+gem 'openstudio-model-articulation', github: 'NREL/openstudio-model-articulation-gem', tag: 'v0.10.0'
+
 gemspec

Gemfile.lock

@@ -1,3 +1,29 @@
+GIT
+  remote: https://github.com/NREL/openstudio-common-measures-gem.git
+  revision: 14535383ad60cb2eef3565fa60ed84619e822a60
+  tag: v0.10.0
+  specs:
+    openstudio-common-measures (0.10.0)
+      addressable (= 2.8.1)
+      bundler (~> 2.4.10)
+      multipart-post (= 2.4.0)
+      openstudio-extension (~> 0.8.0)
+      openstudio-standards (= 0.6.1)
+      regexp_parser (= 2.9.0)
+
+GIT
+  remote: https://github.com/NREL/openstudio-model-articulation-gem.git
+  revision: f9f8c101f2807df2463c5b26d850f1ed3748ddfa
+  tag: v0.10.0
+  specs:
+    openstudio-model-articulation (0.10.0)
+      addressable (= 2.8.1)
+      bundler (~> 2.4.10)
+      multipart-post (= 2.4.0)
+      openstudio-extension (~> 0.8.0)
+      openstudio-standards (= 0.6.1)
+      regexp_parser (= 2.9.0)
+
 PATH
   remote: .
   specs:
@@ -10,132 +36,141 @@ GEM
       public_suffix (>= 2.0.2, < 6.0)
     ansi (1.5.0)
     ast (2.4.2)
-    bcl (0.7.1)
+    bcl (0.8.0)
       builder (= 3.2.4)
       faraday (~> 1.0.1)
       minitar (~> 0.9)
-      openstudio_measure_tester (~> 0.3.1)
+      openstudio_measure_tester (~> 0.4.0)
       rexml (= 3.2.5)
       rubyzip (~> 2.3.2)
       spreadsheet (= 1.2.9)
       uuid (~> 2.3.9)
       yamler (= 0.1.0)
       zliby (= 0.0.5)
     builder (3.2.4)
-    diff-lcs (1.5.0)
+    diff-lcs (1.5.1)
     docile (1.4.0)
     faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
     git (1.12.0)
       addressable (~> 2.8)
       rchardet (~> 1.8)
+    json (2.7.2)
+    json-schema (4.3.1)
+      addressable (>= 2.8)
     macaddr (1.7.2)
       systemu (~> 2.6.5)
+    matrix (0.4.2)
     minitar (0.9)
     minitest (5.14.4)
     minitest-reporters (1.4.3)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    multipart-post (2.3.0)
+    multipart-post (2.4.0)
     octokit (4.18.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    openstudio-common-measures (0.7.0)
-      bundler (>= 2.1)
-      openstudio-extension (~> 0.6.0)
-      openstudio-standards (~> 0.3.0)
-    openstudio-extension (0.6.0)
-      bcl (~> 0.7.1)
-      bundler (~> 2.1.0)
+    openstudio-extension (0.8.0)
+      bcl (~> 0.8.0)
+      bundler (= 2.4.10)
       octokit (~> 4.18.0)
-      openstudio-workflow (~> 2.3.0)
-      openstudio_measure_tester (~> 0.3.1)
+      openstudio-workflow (~> 2.4.0)
+      openstudio_measure_tester (~> 0.4.0)
       parallel (~> 1.19.1)
-    openstudio-model-articulation (0.7.0)
-      bundler (~> 2.1)
-      openstudio-extension (~> 0.6.0)
-      openstudio-standards (~> 0.3.0)
-    openstudio-standards (0.3.0)
-    openstudio-workflow (2.3.1)
-    openstudio_measure_tester (0.3.2)
+    openstudio-standards (0.6.1)
+      tbd (~> 3)
+    openstudio-workflow (2.4.0)
+    openstudio_measure_tester (0.4.0)
       git (~> 1.12.0)
       minitest (~> 5.14.0)
       minitest-reporters (~> 1.4.2)
+      parser (= 3.2.2.2)
       rake (~> 13.0)
-      rubocop (~> 1.15.0)
-      rubocop-checkstyle_formatter (~> 0.4.0)
-      rubocop-performance (~> 1.11.3)
-      simplecov (~> 0.18.2)
+      rubocop (= 1.50)
+      rubocop-checkstyle_formatter (= 0.6.0)
+      rubocop-performance (= 1.20.0)
+      simplecov (= 0.22.0)
+    oslg (0.3.0)
+    osut (0.5.0)
+      oslg (>= 0.3.0)
     parallel (1.19.2)
-    parser (3.2.1.1)
+    parser (3.2.2.2)
       ast (~> 2.4.1)
-    public_suffix (5.0.1)
+    public_suffix (5.1.1)
     rainbow (3.1.1)
-    rake (13.0.6)
+    rake (13.2.1)
     rchardet (1.8.0)
-    regexp_parser (2.7.0)
+    regexp_parser (2.9.0)
     rexml (3.2.5)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.1)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.4)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    rubocop (1.15.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.50.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.5.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.27.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
-    rubocop-checkstyle_formatter (0.4.0)
-      rubocop (>= 0.35.1)
-    rubocop-performance (1.11.5)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    ruby-ole (1.2.12.2)
+    rubocop-checkstyle_formatter (0.6.0)
+      rubocop (>= 1.14.0)
+    rubocop-performance (1.20.0)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
+    ruby-ole (1.2.13.1)
     ruby-progressbar (1.13.0)
     rubyzip (2.3.2)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
-    simplecov (0.18.5)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
     spreadsheet (1.2.9)
       ruby-ole
     systemu (2.6.5)
-    unicode-display_width (2.4.2)
+    tbd (3.4.2)
+      json-schema (~> 4)
+      osut (~> 0)
+      topolys (~> 0)
+    topolys (0.6.2)
+      matrix
+    unicode-display_width (2.5.0)
     uuid (2.3.9)
       macaddr (~> 1.0)
     yamler (0.1.0)
     zliby (0.0.5)
 
 PLATFORMS
-  x64-mingw32
+  x64-mingw-ucrt
 
 DEPENDENCIES
-  bundler (~> 2.1)
   openStudio-coalition-measures!
-  openstudio-common-measures (~> 0.7.0)
-  openstudio-model-articulation (~> 0.7.0)
-  parallel (~> 1.19.2)
+  openstudio-common-measures!
+  openstudio-model-articulation!
+  parallel (~> 1.19)
   rake (~> 13.0)
   rspec (~> 3.11)
 
 BUNDLED WITH
-   2.1.4
+   2.4.10

models/ShoeboxExample/measures/create_bar_from_space_type_ratios/LICENSE.md

@@ -1,27 +1,13 @@
-OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
+OpenStudio(R), Copyright (c) 2008, 2023 Alliance for Sustainable Energy, LLC.
 
-Redistribution and use in source and binary forms, with or without modification, are permitted 
-provided that the following conditions are met:
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
-(1) Redistributions of source code must retain the above copyright notice, this list of conditions 
-and the following disclaimer.
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 
-(2) Redistributions in binary form must reproduce the above copyright notice, this list of conditions
-and the following disclaimer in the documentation and/or other materials provided with the distribution.
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
 
-(3) Neither the name of the copyright holder nor the names of any contributors may be used to endorse 
-or promote products derived from this software without specific prior written permission from the 
-respective party.
+3. Redistribution of this software, without modification, must refer to the software by the same designation. Redistribution of a modified version of this software (i) may not refer to the modified version by the same designation, or by any confusingly similar designation, and (ii) must refer to the underlying software originally provided by Alliance as “OpenStudio®”. Except to comply with the foregoing, the term “OpenStudio®”, or any confusingly similar designation may not be used to refer to any modified version of this software or any modified version of the underlying software originally provided by Alliance without the prior written consent of Alliance.
 
-(4) Other than as required in clauses (1) and (2), distributions in any form of modifications or other 
-derivative works may not use the "OpenStudio" trademark, "OS", "os", or any other confusingly similar 
-designation without specific prior written permission from Alliance for Sustainable Energy, LLC.
+4. The name of the copyright holder(s), any contributors, the United States Government, the United States Department of Energy, or any of their employees may not be used to endorse or promote products derived from this software without specific prior written permission from the respective party.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER, THE UNITED STATES GOVERNMENT, 
-OR ANY CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, 
-OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND ANY CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S), ANY CONTRIBUTORS, THE UNITED STATES GOVERNMENT, OR THE UNITED STATES DEPARTMENT OF ENERGY, NOR ANY OF THEIR EMPLOYEES, BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

models/ShoeboxExample/measures/create_bar_from_space_type_ratios/README.md

@@ -306,7 +306,7 @@ ___
 **Required:** true,
 **Model Dependent:** false
 
-**Choice Display Names** ["DOE Ref Pre-1980", "DOE Ref 1980-2004", "90.1-2004", "90.1-2007", "90.1-2010", "90.1-2013", "90.1-2016", "90.1-2019", "ComStock DOE Ref Pre-1980", "ComStock DOE Ref 1980-2004", "ComStock 90.1-2004", "ComStock 90.1-2007", "ComStock 90.1-2010", "ComStock 90.1-2013", "NREL ZNE Ready 2017", "DEER Pre-1975", "DEER 1985", "DEER 1996", "DEER 2003", "DEER 2007", "DEER 2011", "DEER 2014", "DEER 2015", "DEER 2017", "DEER 2020", "DEER 2025", "DEER 2030", "DEER 2035", "DEER 2040", "DEER 2045", "DEER 2050", "DEER 2055", "DEER 2060", "DEER 2065", "DEER 2070", "DEER 2075"]
+**Choice Display Names** ["DOE Ref Pre-1980", "DOE Ref 1980-2004", "90.1-2004", "90.1-2007", "90.1-2010", "90.1-2013", "90.1-2016", "90.1-2019", "ComStock DOE Ref Pre-1980", "ComStock DOE Ref 1980-2004", "ComStock 90.1-2004", "ComStock 90.1-2007", "ComStock 90.1-2010", "ComStock 90.1-2013", "ComStock 90.1-2016", "ComStock 90.1-2019", "NREL ZNE Ready 2017", "DEER Pre-1975", "DEER 1985", "DEER 1996", "DEER 2003", "DEER 2007", "DEER 2011", "DEER 2014", "DEER 2015", "DEER 2017", "DEER 2020", "DEER 2025", "DEER 2030", "DEER 2035", "DEER 2040", "DEER 2045", "DEER 2050", "DEER 2055", "DEER 2060", "DEER 2065", "DEER 2070", "DEER 2075", "ComStock DEER Pre-1975", "ComStock DEER 1985", "ComStock DEER 1996", "ComStock DEER 2003", "ComStock DEER 2007", "ComStock DEER 2011", "ComStock DEER 2014", "ComStock DEER 2015", "ComStock DEER 2017", "ComStock DEER 2020"]
 
 
 ### Space Type Ratios String