Merge pull request #1170 from NREL/bsb-version-fix

Use gem version on bsb version strings
NREL · Nov 28, 2023 · 18ff4bf · 18ff4bf
2 parents 63c21e4 + e3fadb6
commit 18ff4bf
Show file tree

Hide file tree

Showing 15 changed files with 6,335 additions and 6,341 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## ResStock v3.1.1
+###### November 28, 2023 - [Diff](https://github.com/NREL/resstock/compare/v3.1.0...v3.1.1)
+
+Fixes
+- Use `Gem::Version` on buildstockbatch version string comparisons so that, e.g., '2023.10.0' < '2023.5.0' does not evaluate to true ([#1170](https://github.com/NREL/resstock/pull/1170))
+
 ## ResStock v3.1.0
 ###### May 25, 2023 - [Diff](https://github.com/NREL/resstock/compare/v3.0.0...v3.1.0)
 

diff --git a/measures/ApplyUpgrade/measure.xml b/measures/ApplyUpgrade/measure.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <measure>
-  <schema_version>3.0</schema_version>
+  <schema_version>3.1</schema_version>
   <name>apply_upgrade</name>
   <uid>33f1654c-f734-43d1-b35d-9d2856e41b5a</uid>
-  <version_id>39d68fca-e8bb-4b12-97bd-414df1c3a3b1</version_id>
-  <version_modified>20230310T232749Z</version_modified>
+  <version_id>2d5f18f5-42d2-4ff5-9d21-4eedcac88fd0</version_id>
+  <version_modified>2023-11-27T21:12:56Z</version_modified>
   <xml_checksum>9339BE01</xml_checksum>
   <class_name>ApplyUpgrade</class_name>
   <display_name>Apply Upgrade</display_name>
@@ -6321,18 +6321,6 @@
     </attribute>
   </attributes>
   <files>
-    <file>
-      <filename>constants.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>F595D17B</checksum>
-    </file>
-    <file>
-      <filename>apply_upgrade_test.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>test</usage_type>
-      <checksum>672FDD8F</checksum>
-    </file>
     <file>
       <version>
         <software_program>OpenStudio</software_program>
@@ -6344,5 +6332,17 @@
       <usage_type>script</usage_type>
       <checksum>CEBAEE16</checksum>
     </file>
+    <file>
+      <filename>constants.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>F595D17B</checksum>
+    </file>
+    <file>
+      <filename>apply_upgrade_test.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>A9826856</checksum>
+    </file>
   </files>
 </measure>
diff --git a/measures/ApplyUpgrade/tests/apply_upgrade_test.rb b/measures/ApplyUpgrade/tests/apply_upgrade_test.rb
@@ -4,7 +4,7 @@
 require_relative '../../../resources/hpxml-measures/HPXMLtoOpenStudio/resources/minitest_helper'
 require_relative '../measure.rb'
 
-class ApplyUpgradeTest < MiniTest::Test
+class ApplyUpgradeTest < Minitest::Test
   def test_SFD_1story_FB_UA_GRG_MSHP_FuelTanklessWH
     osw_file = '../../UpgradeCosts/tests/SFD_1story_FB_UA_GRG_MSHP_FuelTanklessWH.osw'
     puts "\nTesting #{File.basename(osw_file)}..."

diff --git a/measures/QOIReport/measure.xml b/measures/QOIReport/measure.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <measure>
-  <schema_version>3.0</schema_version>
+  <schema_version>3.1</schema_version>
   <name>qoi_report</name>
   <uid>be0bfc7f-25c6-435a-9acd-2f5fa8ac817d</uid>
-  <version_id>f5af7f98-7101-4780-8fd7-0b4246505fc1</version_id>
-  <version_modified>20230501T221656Z</version_modified>
+  <version_id>09083188-c2d8-4048-950b-2c251e9da92e</version_id>
+  <version_modified>2023-11-27T21:12:56Z</version_modified>
   <xml_checksum>15BF4E57</xml_checksum>
   <class_name>QOIReport</class_name>
   <display_name>QOI Report</display_name>
@@ -24,18 +24,6 @@
     </attribute>
   </attributes>
   <files>
-    <file>
-      <filename>constants.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>4A01E6CA</checksum>
-    </file>
-    <file>
-      <filename>qoi_report_test.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>test</usage_type>
-      <checksum>FDE812FB</checksum>
-    </file>
     <file>
       <version>
         <software_program>OpenStudio</software_program>
@@ -47,5 +35,17 @@
       <usage_type>script</usage_type>
       <checksum>48961FEB</checksum>
     </file>
+    <file>
+      <filename>constants.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>4A01E6CA</checksum>
+    </file>
+    <file>
+      <filename>qoi_report_test.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>CCE950C4</checksum>
+    </file>
   </files>
 </measure>
diff --git a/measures/QOIReport/tests/qoi_report_test.rb b/measures/QOIReport/tests/qoi_report_test.rb
@@ -3,7 +3,7 @@
 require_relative '../../../resources/hpxml-measures/HPXMLtoOpenStudio/resources/minitest_helper'
 require_relative '../measure.rb'
 
-class QOIReportTest < MiniTest::Test
+class QOIReportTest < Minitest::Test
   # create an instance of the measure
   @@measure = QOIReport.new
 

diff --git a/measures/UpgradeCosts/measure.xml b/measures/UpgradeCosts/measure.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <measure>
-  <schema_version>3.0</schema_version>
+  <schema_version>3.1</schema_version>
   <name>upgrade_costs</name>
   <uid>ef51212c-acc4-48d7-9b29-cf2a5c6c4449</uid>
-  <version_id>06b6caf2-3862-4319-a71f-3ec2543f461a</version_id>
-  <version_modified>20230519T144358Z</version_modified>
+  <version_id>731eb2a6-d2c9-41d6-a4de-f409881c4177</version_id>
+  <version_modified>2023-11-27T21:12:56Z</version_modified>
   <xml_checksum>9BF1E6AC</xml_checksum>
   <class_name>UpgradeCosts</class_name>
   <display_name>Upgrade Costs</display_name>
@@ -66,154 +66,142 @@
       <checksum>79B35318</checksum>
     </file>
     <file>
-      <filename>upgrade_costs_test.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>test</usage_type>
-      <checksum>58C11733</checksum>
-    </file>
-    <file>
-      <filename>SFD_1story_FB_UA_GRG_MSHP_FuelTanklessWH.xml</filename>
-      <filetype>xml</filetype>
-      <usage_type>test</usage_type>
-      <checksum>C330E73B</checksum>
-    </file>
-    <file>
-      <filename>SFD_1story_UB_UA_GRG_ACV_FuelFurnace_PortableHeater_HPWH.xml</filename>
-      <filetype>xml</filetype>
+      <filename>MF_1story_UB_Furnace_AC1_FuelTankWH.osw</filename>
+      <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>FD4C5CC3</checksum>
+      <checksum>C68E5E17</checksum>
     </file>
     <file>
-      <filename>SFD_1story_FB_UA_GRG_RoomAC_ElecBoiler_FuelTanklessWH.osw</filename>
+      <filename>MF_2story_UB_ASHP2_HPWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>2B24F5CE</checksum>
+      <checksum>06DE1BFA</checksum>
     </file>
     <file>
-      <filename>SFD_1story_UB_UA_ASHP2_HPWH.osw</filename>
+      <filename>MF_2story_UB_FuelBoiler_AC1_FuelTankWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>C3A853FE</checksum>
+      <checksum>216058F7</checksum>
     </file>
     <file>
-      <filename>SFD_1story_UB_UA_GRG_ACV_FuelFurnace_HPWH.osw</filename>
+      <filename>MF_2story_UB_Furnace_AC1_FuelTankWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>1974FC1B</checksum>
+      <checksum>A83A4562</checksum>
     </file>
     <file>
-      <filename>SFD_2story_CS_UA_AC2_FuelBoiler_FuelTankWH.osw</filename>
+      <filename>SFA_2story_FB_FuelBoiler_RoomAC_FuelTankWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>B57303D3</checksum>
+      <checksum>C959EBDB</checksum>
     </file>
     <file>
-      <filename>SFD_2story_CS_UA_GRG_ASHPV_FuelTanklessWH.osw</filename>
+      <filename>SFA_2story_UB_ASHP2_HPWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>62034338</checksum>
+      <checksum>4A5DA9E1</checksum>
     </file>
     <file>
-      <filename>SFD_2story_FB_UA_GRG_AC1_ElecBaseboard_FuelTankWH.osw</filename>
+      <filename>SFA_2story_UB_FuelBoiler_RoomAC_FuelTankWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>986E1AAD</checksum>
+      <checksum>BC040D6A</checksum>
     </file>
     <file>
-      <filename>SFD_2story_FB_UA_GRG_AC1_UnitHeater_FuelTankWH.osw</filename>
+      <filename>SFA_2story_UB_Furnace_RoomAC_FuelTankWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>6C58B3A3</checksum>
+      <checksum>D29F7781</checksum>
     </file>
     <file>
-      <filename>SFD_2story_FB_UA_GRG_GSHP_ElecTanklessWH.osw</filename>
+      <filename>SFD_1story_FB_UA_GRG_MSHP_FuelTanklessWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>B3C0D697</checksum>
+      <checksum>B9183037</checksum>
     </file>
     <file>
-      <filename>SFD_2story_PB_UA_ElecFurnace_ElecTankWH.osw</filename>
+      <filename>SFD_1story_FB_UA_GRG_RoomAC_ElecBoiler_FuelTanklessWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>E7CB80D0</checksum>
+      <checksum>2B24F5CE</checksum>
     </file>
     <file>
-      <filename>SFD_1story_UB_UA_GRG_ACV_FuelFurnace_PortableHeater_HPWH.osw</filename>
+      <filename>SFD_1story_UB_UA_ASHP2_HPWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>546A7C2B</checksum>
+      <checksum>C3A853FE</checksum>
     </file>
     <file>
-      <filename>SFD_2story_S_UA_GRG_ASHP1_FuelTanklessWH.osw</filename>
+      <filename>SFD_1story_UB_UA_GRG_ACV_FuelFurnace_HPWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>B165DD4B</checksum>
+      <checksum>1974FC1B</checksum>
     </file>
     <file>
-      <filename>SFD_2story_S_UA_GRG_ASHP1_Fireplace_FuelTanklessWH.osw</filename>
+      <filename>SFD_1story_UB_UA_GRG_ACV_FuelFurnace_PortableHeater_HPWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>D58957CE</checksum>
+      <checksum>546A7C2B</checksum>
     </file>
     <file>
-      <filename>SFD_2story_S_UA_GRG_ASHP1_Fireplace_FuelTanklessWH_ERV.osw</filename>
+      <filename>SFD_2story_CS_UA_AC2_FuelBoiler_FuelTankWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>B0E2610B</checksum>
+      <checksum>B57303D3</checksum>
     </file>
     <file>
-      <filename>SFD_1story_FB_UA_GRG_MSHP_FuelTanklessWH.osw</filename>
+      <filename>SFD_2story_CS_UA_GRG_ASHPV_FuelTanklessWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>B9183037</checksum>
+      <checksum>62034338</checksum>
     </file>
     <file>
-      <filename>MF_1story_UB_Furnace_AC1_FuelTankWH.osw</filename>
+      <filename>SFD_2story_FB_UA_GRG_AC1_ElecBaseboard_FuelTankWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>C68E5E17</checksum>
+      <checksum>986E1AAD</checksum>
     </file>
     <file>
-      <filename>MF_2story_UB_ASHP2_HPWH.osw</filename>
+      <filename>SFD_2story_FB_UA_GRG_AC1_UnitHeater_FuelTankWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>06DE1BFA</checksum>
+      <checksum>6C58B3A3</checksum>
     </file>
     <file>
-      <filename>MF_2story_UB_FuelBoiler_AC1_FuelTankWH.osw</filename>
+      <filename>SFD_2story_FB_UA_GRG_GSHP_ElecTanklessWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>216058F7</checksum>
+      <checksum>B3C0D697</checksum>
     </file>
     <file>
-      <filename>MF_2story_UB_Furnace_AC1_FuelTankWH.osw</filename>
+      <filename>SFD_2story_PB_UA_ElecFurnace_ElecTankWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>A83A4562</checksum>
+      <checksum>E7CB80D0</checksum>
     </file>
     <file>
-      <filename>SFA_2story_FB_FuelBoiler_RoomAC_FuelTankWH.osw</filename>
+      <filename>SFD_2story_S_UA_GRG_ASHP1_Fireplace_FuelTanklessWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>C959EBDB</checksum>
+      <checksum>D58957CE</checksum>
     </file>
     <file>
-      <filename>SFA_2story_UB_ASHP2_HPWH.osw</filename>
+      <filename>SFD_2story_S_UA_GRG_ASHP1_Fireplace_FuelTanklessWH_ERV.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>4A5DA9E1</checksum>
+      <checksum>B0E2610B</checksum>
     </file>
     <file>
-      <filename>SFA_2story_UB_FuelBoiler_RoomAC_FuelTankWH.osw</filename>
+      <filename>SFD_2story_S_UA_GRG_ASHP1_FuelTanklessWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>BC040D6A</checksum>
+      <checksum>B165DD4B</checksum>
     </file>
     <file>
-      <filename>SFA_2story_UB_Furnace_RoomAC_FuelTankWH.osw</filename>
-      <filetype>osw</filetype>
+      <filename>upgrade_costs_test.rb</filename>
+      <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>D29F7781</checksum>
+      <checksum>01E4157F</checksum>
     </file>
   </files>
 </measure>
diff --git a/measures/UpgradeCosts/tests/upgrade_costs_test.rb b/measures/UpgradeCosts/tests/upgrade_costs_test.rb
@@ -5,7 +5,7 @@
 require_relative '../../../measures/ReportHPXMLOutput/measure.rb'
 require_relative '../measure.rb'
 
-class UpgradeCostsTest < MiniTest::Test
+class UpgradeCostsTest < Minitest::Test
   def test_SFD_1story_FB_UA_GRG_MSHP_FuelTanklessWH
     cost_multipliers = {
       'Fixed (1)' => 1,

diff --git a/project_national/tests/test.rb b/project_national/tests/test.rb
@@ -3,7 +3,7 @@
 require_relative '../../resources/hpxml-measures/HPXMLtoOpenStudio/resources/minitest_helper'
 require_relative '../../test/integrity_checks'
 
-class TestProjectNational < MiniTest::Test
+class TestProjectNational < Minitest::Test
   def test_housing_characteristics
     begin
       project_dir_name = File.basename(File.dirname(File.dirname(__FILE__)))

diff --git a/project_testing/tests/test.rb b/project_testing/tests/test.rb
@@ -3,7 +3,7 @@
 require_relative '../../resources/hpxml-measures/HPXMLtoOpenStudio/resources/minitest_helper'
 require_relative '../../test/integrity_checks'
 
-class TestProjectTesting < MiniTest::Test
+class TestProjectTesting < Minitest::Test
   def test_housing_characteristics
     begin
       project_dir_name = File.basename(File.dirname(File.dirname(__FILE__)))

diff --git a/resources/buildstock.rb b/resources/buildstock.rb
@@ -543,13 +543,13 @@ def self._rm_path(path)
 end
 
 class Version
-  ResStock_Version = '3.1.0' # Version of ResStock
+  ResStock_Version = '3.1.1' # Version of ResStock
   BuildStockBatch_Version = '2023.5.0' # Minimum required version of BuildStockBatch
 
   def self.check_buildstockbatch_version
     if ENV.keys.include?('BUILDSTOCKBATCH_VERSION') # buildstockbatch is installed
       bsb_version = ENV['BUILDSTOCKBATCH_VERSION']
-      if bsb_version < BuildStockBatch_Version
+      if Gem::Version.new(bsb_version) < Gem::Version.new(BuildStockBatch_Version)
         fail "BuildStockBatch version #{BuildStockBatch_Version} or above is required. Found version: #{bsb_version}"
       end
     end