Merge pull request #1172 from NREL/3_1_1

Merge v3.1.1 into develop

CHANGELOG.md

@@ -25,6 +25,12 @@ Fixes
 - Minor changes to heating and cooling setpoint TSV after a bug fix ([#1136](https://github.com/NREL/resstock/pull/1136))
 - Update `run_analysis.rb` to handle illegal path characters in upgrade names ([#1138](https://github.com/NREL/resstock/pull/1138))
 
+## 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)
 

measures/ApplyUpgrade/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>apply_upgrade</name>
   <uid>33f1654c-f734-43d1-b35d-9d2856e41b5a</uid>
-  <version_id>be74c59b-d687-48f9-9546-321be4996262</version_id>
-  <version_modified>2023-11-03T23:11:43Z</version_modified>
+  <version_id>e5275162-7201-4b63-b6ce-1fd75290153d</version_id>
+  <version_modified>2023-11-28T17:40:40Z</version_modified>
   <xml_checksum>9339BE01</xml_checksum>
   <class_name>ApplyUpgrade</class_name>
   <display_name>Apply Upgrade</display_name>

measures/QOIReport/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>qoi_report</name>
   <uid>be0bfc7f-25c6-435a-9acd-2f5fa8ac817d</uid>
-  <version_id>2f6edf9b-57ba-4937-8036-5eeff170833e</version_id>
-  <version_modified>2023-10-25T20:58:49Z</version_modified>
+  <version_id>47a2859c-5621-49f1-a98e-62866d1cfbe9</version_id>
+  <version_modified>2023-11-28T17:40:40Z</version_modified>
   <xml_checksum>15BF4E57</xml_checksum>
   <class_name>QOIReport</class_name>
   <display_name>QOI Report</display_name>

measures/UpgradeCosts/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>upgrade_costs</name>
   <uid>ef51212c-acc4-48d7-9b29-cf2a5c6c4449</uid>
-  <version_id>7fa6c4de-66f1-4a23-9d43-789bdd6ee23b</version_id>
-  <version_modified>2023-11-10T03:27:02Z</version_modified>
+  <version_id>a3c3248f-c3a4-4a5d-88be-60fb99ef9d69</version_id>
+  <version_modified>2023-11-28T17:40:40Z</version_modified>
   <xml_checksum>9BF1E6AC</xml_checksum>
   <class_name>UpgradeCosts</class_name>
   <display_name>Upgrade Costs</display_name>

resources/buildstock.rb

@@ -549,7 +549,7 @@ 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.10.0' # Minimum required version of BuildStockBatch
 
   def self.check_buildstockbatch_version