Merge pull request #1078 from NREL/3_1_0

Prep v3.1.0 release
NREL · May 25, 2023 · e65c23e · e65c23e
2 parents e760640 + 0dae53c
commit e65c23e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
-## ResStock v3.1.0 (pending)
+## ResStock v3.1.0
+###### May 25, 2023 - [Diff](https://github.com/NREL/resstock/compare/v3.0.0...v3.1.0)
 
 Features
 - Include battery modeling capabilities for project_testing ([#1009](https://github.com/NREL/resstock/pull/1009))
@@ -13,6 +14,7 @@ Features
 
 Fixes
 - Pulls in upstream OS-HPXML fix related to [avoiding possible OpenStudio temporary directory collision](https://github.com/NREL/OpenStudio-HPXML/pull/1316) causing random errors ([#1054](https://github.com/NREL/resstock/pull/1054))
+- Pulls in upstream OS-HPXML fix related to [falling back to a WWR calculation when window placement fails](https://github.com/NREL/OpenStudio-HPXML/pull/1385) causing errors fitting windows ([#1076](https://github.com/NREL/resstock/pull/1076))
 
 ## ResStock v3.0.0
 ###### February 3, 2023 - [Diff](https://github.com/NREL/resstock/compare/v2.5.0...v3.0.0)

diff --git a/resources/buildstock.rb b/resources/buildstock.rb
@@ -543,8 +543,8 @@ def self._rm_path(path)
 end
 
 class Version
-  ResStock_Version = '3.0.0' # Version of ResStock
-  BuildStockBatch_Version = '2023.1.0' # Minimum required version of BuildStockBatch
+  ResStock_Version = '3.1.0' # 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