Merge pull request #169 from NREL/0.10.0-rc1

PR for testing OS 3.8.0rc-2
NREL · Jul 11, 2024 · 9f1f232 · 9f1f232
2 parents 473f9e7 + 46b8e29
commit 9f1f232
Show file tree

Hide file tree

Showing 117 changed files with 2,351 additions and 2,330 deletions.
diff --git a/.github/workflows/test_with_openstudio.yml b/.github/workflows/test_with_openstudio.yml
@@ -17,7 +17,7 @@ jobs:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
     container:
-      image: nrel/openstudio:3.7.0
+      image: nrel/openstudio:3.8.0
 
     steps:
       - uses: actions/checkout@v2
@@ -34,7 +34,7 @@ jobs:
       - name: install dependencies
         shell: bash
         run: |
-          gem install bundler -v '2.1.4'
+          gem install bundler -v '2.4.10'
           bundle -v
           bundle install
       - name: run tests

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # OpenStudio Common Measures Gem
 
+## Version 0.10.0
+- Support for OpenStudio 3.8 (upgrade to standards gem 0.6.0, extension gem 0.8.0)
+- Support Ruby 3.2.2
+
 ## Version 0.9.0
 
 - Support for OpenStudio 3.7 (upgrade to standards gem 0.5.0, extension gem 0.7)

diff --git a/Gemfile b/Gemfile
@@ -1,5 +1,6 @@
 source 'http://rubygems.org'
 
+# Specify your gem's dependencies in openstudio-model-articulation.gemspec
 gemspec
 
 # Local gems are useful when developing and integrating the various dependencies.
@@ -10,12 +11,16 @@ gemspec
 # checkout the latest version (develop) from github.
 allow_local = ENV['FAVOR_LOCAL_GEMS']
 
+# Delete when these branchesa are merged and released
+# gem 'openstudio-extension', github: 'NREL/OpenStudio-extension-gem', branch: 'wenyi-bypass-zlib'
+# gem 'openstudio-standards', github: 'NREL/openstudio-standards', tag: 'v0.6.0.rc2', ref: "1c42110"
+# gem 'openstudio_measure_tester', :git => 'https://github.com/NREL/OpenStudio-measure-tester-gem.git', :branch => 'wenyi-dependencies-update'
+# gem 'openstudio-workflow', :git => 'https://github.com/NREL/OpenStudio-workflow-gem.git', :branch => 'develop', ref: "32126e9b9f6"
+# gem 'bcl', :git => 'https://github.com/wenyikuang/bcl-gem.git', :branch => 'develop'
+
+# Only uncomment if you need to test a different version of the extension gem
 if allow_local && File.exist?('../OpenStudio-extension-gem')
   gem 'openstudio-extension', path: '../OpenStudio-extension-gem'
 elsif allow_local
   gem 'openstudio-extension', github: 'NREL/OpenStudio-extension-gem', branch: 'develop'
-end
-
-# For Testing
-# gem 'openstudio-standards', github: 'NREL/openstudio-standards', branch: '3.5.0_changes'
-# gem 'openstudio-extension', github: 'NREL/OpenStudio-extension-gem', branch: 'v0.6.0'
+end
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,6 +1,6 @@
 //Jenkins pipelines are stored in shared libraries. Please see: https://github.com/NREL/cbci_jenkins_libs
 
-@Library('cbci_shared_libs') _
+@Library('cbci_shared_libs@developExtension') _
 
 // Build for PR to develop branch only. 
 if ((env.CHANGE_ID) && (env.CHANGE_TARGET) ) { // check if set

diff --git a/README.md b/README.md
@@ -38,6 +38,7 @@ bundle exec rake openstudio:test_with_openstudio
 
 |OpenStudio Common Measures Gem|OpenStudio|Ruby|
 |:--------------:|:----------:|:--------:|
+| 0.10.0         | 3.8      | 3.2.2    |
 | 0.9.0         | 3.7      | 2.7    |
 | 0.8.0         | 3.6      | 2.7    |
 | 0.7.0         | 3.5      | 2.7    |

diff --git a/lib/measures/.rubocop.yml b/lib/measures/.rubocop.yml
@@ -0,0 +1,6 @@
+AllCops:
+  Exclude:
+    - 'spec/test_measures/**/*'
+require: rubocop-performance
+inherit_from:
+  - http://s3.amazonaws.com/openstudio-resources/styles/rubocop_v4.yml
diff --git a/lib/measures/AddCostPerAreaToConstruction/measure.xml b/lib/measures/AddCostPerAreaToConstruction/measure.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <measure>
-  <schema_version>3.0</schema_version>
+  <schema_version>3.1</schema_version>
   <name>add_cost_per_area_to_construction</name>
   <uid>bf6ac5d5-6348-4012-b7b4-1200a672e377</uid>
-  <version_id>31107677-dcac-4fa7-996a-9d1bb202737c</version_id>
-  <version_modified>20221115T223558Z</version_modified>
+  <version_id>860086a0-4eb3-4290-af42-1ebdadb94125</version_id>
+  <version_modified>2024-07-11T14:32:03Z</version_modified>
   <xml_checksum>35DA4ED3</xml_checksum>
   <class_name>AddCostPerAreaToConstruction</class_name>
   <display_name>Add Cost per Area to Construction</display_name>
@@ -140,23 +140,23 @@ For baseline costs, 'Years Until Costs Start' indicates the year that the capita
   </attributes>
   <files>
     <file>
-      <filename>0416_NetArea_b.osm</filename>
-      <filetype>osm</filetype>
-      <usage_type>test</usage_type>
-      <checksum>3D3EE8E9</checksum>
-    </file>
-    <file>
-      <filename>README.md.erb</filename>
-      <filetype>erb</filetype>
-      <usage_type>readmeerb</usage_type>
-      <checksum>703C9964</checksum>
+      <filename>LICENSE.md</filename>
+      <filetype>md</filetype>
+      <usage_type>license</usage_type>
+      <checksum>BFFB1AA6</checksum>
     </file>
     <file>
       <filename>README.md</filename>
       <filetype>md</filetype>
       <usage_type>readme</usage_type>
       <checksum>E8C8B150</checksum>
     </file>
+    <file>
+      <filename>README.md.erb</filename>
+      <filetype>erb</filetype>
+      <usage_type>readmeerb</usage_type>
+      <checksum>703C9964</checksum>
+    </file>
     <file>
       <version>
         <software_program>OpenStudio</software_program>
@@ -166,19 +166,19 @@ For baseline costs, 'Years Until Costs Start' indicates the year that the capita
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>639725D7</checksum>
+      <checksum>C55F964C</checksum>
     </file>
     <file>
-      <filename>AddCostPerAreaToConstruction_Test.rb</filename>
-      <filetype>rb</filetype>
+      <filename>0416_NetArea_b.osm</filename>
+      <filetype>osm</filetype>
       <usage_type>test</usage_type>
-      <checksum>44FC87CD</checksum>
+      <checksum>3D3EE8E9</checksum>
     </file>
     <file>
-      <filename>LICENSE.md</filename>
-      <filetype>md</filetype>
-      <usage_type>license</usage_type>
-      <checksum>64FFEBDE</checksum>
+      <filename>AddCostPerAreaToConstruction_Test.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>9DF2FFF9</checksum>
     </file>
   </files>
 </measure>
diff --git a/lib/measures/AddCostPerFloorAreaToBuilding/measure.xml b/lib/measures/AddCostPerFloorAreaToBuilding/measure.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <measure>
-  <schema_version>3.0</schema_version>
+  <schema_version>3.1</schema_version>
   <name>add_cost_per_floor_area_to_building</name>
   <uid>153992bb-0202-424b-9fbb-57fcf0285e65</uid>
-  <version_id>00195ee2-2b09-4270-aa2a-e9642d582b63</version_id>
-  <version_modified>20221115T223602Z</version_modified>
+  <version_id>763c9857-93fa-4049-a8c0-6161c30eb541</version_id>
+  <version_modified>2024-07-11T14:32:06Z</version_modified>
   <xml_checksum>35DA4ED3</xml_checksum>
   <class_name>AddCostPerFloorAreaToBuilding</class_name>
   <display_name>Add Cost per Floor Area to Building</display_name>
@@ -141,29 +141,23 @@ For baseline costs, 'Years Until Costs Start' indicates the year that the capita
   </attributes>
   <files>
     <file>
-      <filename>0416_NetArea_b.osm</filename>
-      <filetype>osm</filetype>
-      <usage_type>test</usage_type>
-      <checksum>3D3EE8E9</checksum>
+      <filename>LICENSE.md</filename>
+      <filetype>md</filetype>
+      <usage_type>license</usage_type>
+      <checksum>BFFB1AA6</checksum>
     </file>
     <file>
-      <filename>0924_demo_e.osm</filename>
-      <filetype>osm</filetype>
-      <usage_type>test</usage_type>
-      <checksum>6615D680</checksum>
+      <filename>README.md</filename>
+      <filetype>md</filetype>
+      <usage_type>readme</usage_type>
+      <checksum>DE5B21BA</checksum>
     </file>
     <file>
       <filename>README.md.erb</filename>
       <filetype>erb</filetype>
       <usage_type>readmeerb</usage_type>
       <checksum>703C9964</checksum>
     </file>
-    <file>
-      <filename>README.md</filename>
-      <filetype>md</filetype>
-      <usage_type>readme</usage_type>
-      <checksum>DE5B21BA</checksum>
-    </file>
     <file>
       <version>
         <software_program>OpenStudio</software_program>
@@ -173,19 +167,25 @@ For baseline costs, 'Years Until Costs Start' indicates the year that the capita
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>E92E034C</checksum>
+      <checksum>E067600B</checksum>
     </file>
     <file>
-      <filename>AddCostPerFloorAreaToBuilding_Test.rb</filename>
-      <filetype>rb</filetype>
+      <filename>0416_NetArea_b.osm</filename>
+      <filetype>osm</filetype>
       <usage_type>test</usage_type>
-      <checksum>5B187CC2</checksum>
+      <checksum>3D3EE8E9</checksum>
     </file>
     <file>
-      <filename>LICENSE.md</filename>
-      <filetype>md</filetype>
-      <usage_type>license</usage_type>
-      <checksum>64FFEBDE</checksum>
+      <filename>0924_demo_e.osm</filename>
+      <filetype>osm</filetype>
+      <usage_type>test</usage_type>
+      <checksum>6615D680</checksum>
+    </file>
+    <file>
+      <filename>AddCostPerFloorAreaToBuilding_Test.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>EDAC8370</checksum>
     </file>
   </files>
 </measure>
diff --git a/lib/measures/AddCostPerFloorAreaToElectricEquipment/measure.xml b/lib/measures/AddCostPerFloorAreaToElectricEquipment/measure.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <measure>
-  <schema_version>3.0</schema_version>
+  <schema_version>3.1</schema_version>
   <name>add_cost_per_floor_area_to_electric_equipment</name>
   <uid>42cf1acc-c0bc-46cd-af67-8a17cadaab7b</uid>
-  <version_id>878740df-ba76-4b19-9baf-e845b66097e0</version_id>
-  <version_modified>20221115T223556Z</version_modified>
+  <version_id>e584d703-1f79-47dc-9940-126d4927a992</version_id>
+  <version_modified>2024-07-11T14:32:01Z</version_modified>
   <xml_checksum>35DA4ED3</xml_checksum>
   <class_name>AddCostPerFloorAreaToElectricEquipment</class_name>
   <display_name>Add Cost per Floor Area to Electric Equipment</display_name>
@@ -140,23 +140,23 @@ For baseline costs, 'Years Until Costs Start' indicates the year that the capita
   </attributes>
   <files>
     <file>
-      <filename>0416_NetArea_b.osm</filename>
-      <filetype>osm</filetype>
-      <usage_type>test</usage_type>
-      <checksum>3D3EE8E9</checksum>
-    </file>
-    <file>
-      <filename>README.md.erb</filename>
-      <filetype>erb</filetype>
-      <usage_type>readmeerb</usage_type>
-      <checksum>703C9964</checksum>
+      <filename>LICENSE.md</filename>
+      <filetype>md</filetype>
+      <usage_type>license</usage_type>
+      <checksum>BFFB1AA6</checksum>
     </file>
     <file>
       <filename>README.md</filename>
       <filetype>md</filetype>
       <usage_type>readme</usage_type>
       <checksum>F4D7E305</checksum>
     </file>
+    <file>
+      <filename>README.md.erb</filename>
+      <filetype>erb</filetype>
+      <usage_type>readmeerb</usage_type>
+      <checksum>703C9964</checksum>
+    </file>
     <file>
       <version>
         <software_program>OpenStudio</software_program>
@@ -166,19 +166,19 @@ For baseline costs, 'Years Until Costs Start' indicates the year that the capita
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>808F6B1D</checksum>
+      <checksum>878DCC90</checksum>
     </file>
     <file>
-      <filename>AddCostPerFloorAreaToElectricEquipment_Test.rb</filename>
-      <filetype>rb</filetype>
+      <filename>0416_NetArea_b.osm</filename>
+      <filetype>osm</filetype>
       <usage_type>test</usage_type>
-      <checksum>146B4156</checksum>
+      <checksum>3D3EE8E9</checksum>
     </file>
     <file>
-      <filename>LICENSE.md</filename>
-      <filetype>md</filetype>
-      <usage_type>license</usage_type>
-      <checksum>64FFEBDE</checksum>
+      <filename>AddCostPerFloorAreaToElectricEquipment_Test.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>BFD5BDA4</checksum>
     </file>
   </files>
 </measure>
diff --git a/lib/measures/AddCostPerFloorAreaToLights/measure.xml b/lib/measures/AddCostPerFloorAreaToLights/measure.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <measure>
-  <schema_version>3.0</schema_version>
+  <schema_version>3.1</schema_version>
   <name>add_cost_per_floor_area_to_lights</name>
   <uid>eeec5adf-b3a8-498a-b0d1-eabd81ca0620</uid>
-  <version_id>a0e1d94d-12f7-46a8-8cdd-3fa40e32ce9f</version_id>
-  <version_modified>20221115T223600Z</version_modified>
+  <version_id>585d2977-848a-421c-9da0-e798d70f8c2c</version_id>
+  <version_modified>2024-07-11T14:32:04Z</version_modified>
   <xml_checksum>35DA4ED3</xml_checksum>
   <class_name>AddCostPerFloorAreaToLights</class_name>
   <display_name>Add Cost per FloorArea to Lights</display_name>
@@ -140,23 +140,23 @@ For baseline costs, 'Years Until Costs Start' indicates the year that the capita
   </attributes>
   <files>
     <file>
-      <filename>0416_NetArea_b.osm</filename>
-      <filetype>osm</filetype>
-      <usage_type>test</usage_type>
-      <checksum>3D3EE8E9</checksum>
-    </file>
-    <file>
-      <filename>README.md.erb</filename>
-      <filetype>erb</filetype>
-      <usage_type>readmeerb</usage_type>
-      <checksum>703C9964</checksum>
+      <filename>LICENSE.md</filename>
+      <filetype>md</filetype>
+      <usage_type>license</usage_type>
+      <checksum>BFFB1AA6</checksum>
     </file>
     <file>
       <filename>README.md</filename>
       <filetype>md</filetype>
       <usage_type>readme</usage_type>
       <checksum>58C38C0E</checksum>
     </file>
+    <file>
+      <filename>README.md.erb</filename>
+      <filetype>erb</filetype>
+      <usage_type>readmeerb</usage_type>
+      <checksum>703C9964</checksum>
+    </file>
     <file>
       <version>
         <software_program>OpenStudio</software_program>
@@ -166,19 +166,19 @@ For baseline costs, 'Years Until Costs Start' indicates the year that the capita
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>3F22D79C</checksum>
+      <checksum>C42B8DD0</checksum>
     </file>
     <file>
-      <filename>AddCostPerFloorAreaToLights_Test.rb</filename>
-      <filetype>rb</filetype>
+      <filename>0416_NetArea_b.osm</filename>
+      <filetype>osm</filetype>
       <usage_type>test</usage_type>
-      <checksum>368AF36A</checksum>
+      <checksum>3D3EE8E9</checksum>
     </file>
     <file>
-      <filename>LICENSE.md</filename>
-      <filetype>md</filetype>
-      <usage_type>license</usage_type>
-      <checksum>64FFEBDE</checksum>
+      <filename>AddCostPerFloorAreaToLights_Test.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>3D7791B0</checksum>
     </file>
   </files>
 </measure>