Skip to content

Commit 18ff4bf

Browse files
joseph-robertsonjoseph-robertson
authored
Merge pull request #1170 from NREL/bsb-version-fix
Use gem version on bsb version strings
2 parents 63c21e4 + e3fadb6 commit 18ff4bf

File tree

15 files changed

+6335
-6341
lines changed

15 files changed

+6335
-6341
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## ResStock v3.1.1
2+
###### November 28, 2023 - [Diff](https://github.com/NREL/resstock/compare/v3.1.0...v3.1.1)
3+
4+
Fixes
5+
- 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))
6+
17
## ResStock v3.1.0
28
###### May 25, 2023 - [Diff](https://github.com/NREL/resstock/compare/v3.0.0...v3.1.0)
39

‎measures/ApplyUpgrade/measure.xml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0"?>
22
<measure>
3-
<schema_version>3.0</schema_version>
3+
<schema_version>3.1</schema_version>
44
<name>apply_upgrade</name>
55
<uid>33f1654c-f734-43d1-b35d-9d2856e41b5a</uid>
6-
<version_id>39d68fca-e8bb-4b12-97bd-414df1c3a3b1</version_id>
7-
<version_modified>20230310T232749Z</version_modified>
6+
<version_id>2d5f18f5-42d2-4ff5-9d21-4eedcac88fd0</version_id>
7+
<version_modified>2023-11-27T21:12:56Z</version_modified>
88
<xml_checksum>9339BE01</xml_checksum>
99
<class_name>ApplyUpgrade</class_name>
1010
<display_name>Apply Upgrade</display_name>
@@ -6321,18 +6321,6 @@
63216321
</attribute>
63226322
</attributes>
63236323
<files>
6324-
<file>
6325-
<filename>constants.rb</filename>
6326-
<filetype>rb</filetype>
6327-
<usage_type>resource</usage_type>
6328-
<checksum>F595D17B</checksum>
6329-
</file>
6330-
<file>
6331-
<filename>apply_upgrade_test.rb</filename>
6332-
<filetype>rb</filetype>
6333-
<usage_type>test</usage_type>
6334-
<checksum>672FDD8F</checksum>
6335-
</file>
63366324
<file>
63376325
<version>
63386326
<software_program>OpenStudio</software_program>
@@ -6344,5 +6332,17 @@
63446332
<usage_type>script</usage_type>
63456333
<checksum>CEBAEE16</checksum>
63466334
</file>
6335+
<file>
6336+
<filename>constants.rb</filename>
6337+
<filetype>rb</filetype>
6338+
<usage_type>resource</usage_type>
6339+
<checksum>F595D17B</checksum>
6340+
</file>
6341+
<file>
6342+
<filename>apply_upgrade_test.rb</filename>
6343+
<filetype>rb</filetype>
6344+
<usage_type>test</usage_type>
6345+
<checksum>A9826856</checksum>
6346+
</file>
63476347
</files>
63486348
</measure>

‎measures/ApplyUpgrade/tests/apply_upgrade_test.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
require_relative '../../../resources/hpxml-measures/HPXMLtoOpenStudio/resources/minitest_helper'
55
require_relative '../measure.rb'
66

7-
class ApplyUpgradeTest < MiniTest::Test
7+
class ApplyUpgradeTest < Minitest::Test
88
def test_SFD_1story_FB_UA_GRG_MSHP_FuelTanklessWH
99
osw_file = '../../UpgradeCosts/tests/SFD_1story_FB_UA_GRG_MSHP_FuelTanklessWH.osw'
1010
puts "\nTesting #{File.basename(osw_file)}..."

‎measures/QOIReport/measure.xml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0"?>
22
<measure>
3-
<schema_version>3.0</schema_version>
3+
<schema_version>3.1</schema_version>
44
<name>qoi_report</name>
55
<uid>be0bfc7f-25c6-435a-9acd-2f5fa8ac817d</uid>
6-
<version_id>f5af7f98-7101-4780-8fd7-0b4246505fc1</version_id>
7-
<version_modified>20230501T221656Z</version_modified>
6+
<version_id>09083188-c2d8-4048-950b-2c251e9da92e</version_id>
7+
<version_modified>2023-11-27T21:12:56Z</version_modified>
88
<xml_checksum>15BF4E57</xml_checksum>
99
<class_name>QOIReport</class_name>
1010
<display_name>QOI Report</display_name>
@@ -24,18 +24,6 @@
2424
</attribute>
2525
</attributes>
2626
<files>
27-
<file>
28-
<filename>constants.rb</filename>
29-
<filetype>rb</filetype>
30-
<usage_type>resource</usage_type>
31-
<checksum>4A01E6CA</checksum>
32-
</file>
33-
<file>
34-
<filename>qoi_report_test.rb</filename>
35-
<filetype>rb</filetype>
36-
<usage_type>test</usage_type>
37-
<checksum>FDE812FB</checksum>
38-
</file>
3927
<file>
4028
<version>
4129
<software_program>OpenStudio</software_program>
@@ -47,5 +35,17 @@
4735
<usage_type>script</usage_type>
4836
<checksum>48961FEB</checksum>
4937
</file>
38+
<file>
39+
<filename>constants.rb</filename>
40+
<filetype>rb</filetype>
41+
<usage_type>resource</usage_type>
42+
<checksum>4A01E6CA</checksum>
43+
</file>
44+
<file>
45+
<filename>qoi_report_test.rb</filename>
46+
<filetype>rb</filetype>
47+
<usage_type>test</usage_type>
48+
<checksum>CCE950C4</checksum>
49+
</file>
5050
</files>
5151
</measure>

‎measures/QOIReport/tests/qoi_report_test.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require_relative '../../../resources/hpxml-measures/HPXMLtoOpenStudio/resources/minitest_helper'
44
require_relative '../measure.rb'
55

6-
class QOIReportTest < MiniTest::Test
6+
class QOIReportTest < Minitest::Test
77
# create an instance of the measure
88
@@measure = QOIReport.new
99

‎measures/UpgradeCosts/measure.xml‎

Lines changed: 51 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0"?>
22
<measure>
3-
<schema_version>3.0</schema_version>
3+
<schema_version>3.1</schema_version>
44
<name>upgrade_costs</name>
55
<uid>ef51212c-acc4-48d7-9b29-cf2a5c6c4449</uid>
6-
<version_id>06b6caf2-3862-4319-a71f-3ec2543f461a</version_id>
7-
<version_modified>20230519T144358Z</version_modified>
6+
<version_id>731eb2a6-d2c9-41d6-a4de-f409881c4177</version_id>
7+
<version_modified>2023-11-27T21:12:56Z</version_modified>
88
<xml_checksum>9BF1E6AC</xml_checksum>
99
<class_name>UpgradeCosts</class_name>
1010
<display_name>Upgrade Costs</display_name>
@@ -66,154 +66,142 @@
6666
<checksum>79B35318</checksum>
6767
</file>
6868
<file>
69-
<filename>upgrade_costs_test.rb</filename>
70-
<filetype>rb</filetype>
71-
<usage_type>test</usage_type>
72-
<checksum>58C11733</checksum>
73-
</file>
74-
<file>
75-
<filename>SFD_1story_FB_UA_GRG_MSHP_FuelTanklessWH.xml</filename>
76-
<filetype>xml</filetype>
77-
<usage_type>test</usage_type>
78-
<checksum>C330E73B</checksum>
79-
</file>
80-
<file>
81-
<filename>SFD_1story_UB_UA_GRG_ACV_FuelFurnace_PortableHeater_HPWH.xml</filename>
82-
<filetype>xml</filetype>
69+
<filename>MF_1story_UB_Furnace_AC1_FuelTankWH.osw</filename>
70+
<filetype>osw</filetype>
8371
<usage_type>test</usage_type>
84-
<checksum>FD4C5CC3</checksum>
72+
<checksum>C68E5E17</checksum>
8573
</file>
8674
<file>
87-
<filename>SFD_1story_FB_UA_GRG_RoomAC_ElecBoiler_FuelTanklessWH.osw</filename>
75+
<filename>MF_2story_UB_ASHP2_HPWH.osw</filename>
8876
<filetype>osw</filetype>
8977
<usage_type>test</usage_type>
90-
<checksum>2B24F5CE</checksum>
78+
<checksum>06DE1BFA</checksum>
9179
</file>
9280
<file>
93-
<filename>SFD_1story_UB_UA_ASHP2_HPWH.osw</filename>
81+
<filename>MF_2story_UB_FuelBoiler_AC1_FuelTankWH.osw</filename>
9482
<filetype>osw</filetype>
9583
<usage_type>test</usage_type>
96-
<checksum>C3A853FE</checksum>
84+
<checksum>216058F7</checksum>
9785
</file>
9886
<file>
99-
<filename>SFD_1story_UB_UA_GRG_ACV_FuelFurnace_HPWH.osw</filename>
87+
<filename>MF_2story_UB_Furnace_AC1_FuelTankWH.osw</filename>
10088
<filetype>osw</filetype>
10189
<usage_type>test</usage_type>
102-
<checksum>1974FC1B</checksum>
90+
<checksum>A83A4562</checksum>
10391
</file>
10492
<file>
105-
<filename>SFD_2story_CS_UA_AC2_FuelBoiler_FuelTankWH.osw</filename>
93+
<filename>SFA_2story_FB_FuelBoiler_RoomAC_FuelTankWH.osw</filename>
10694
<filetype>osw</filetype>
10795
<usage_type>test</usage_type>
108-
<checksum>B57303D3</checksum>
96+
<checksum>C959EBDB</checksum>
10997
</file>
11098
<file>
111-
<filename>SFD_2story_CS_UA_GRG_ASHPV_FuelTanklessWH.osw</filename>
99+
<filename>SFA_2story_UB_ASHP2_HPWH.osw</filename>
112100
<filetype>osw</filetype>
113101
<usage_type>test</usage_type>
114-
<checksum>62034338</checksum>
102+
<checksum>4A5DA9E1</checksum>
115103
</file>
116104
<file>
117-
<filename>SFD_2story_FB_UA_GRG_AC1_ElecBaseboard_FuelTankWH.osw</filename>
105+
<filename>SFA_2story_UB_FuelBoiler_RoomAC_FuelTankWH.osw</filename>
118106
<filetype>osw</filetype>
119107
<usage_type>test</usage_type>
120-
<checksum>986E1AAD</checksum>
108+
<checksum>BC040D6A</checksum>
121109
</file>
122110
<file>
123-
<filename>SFD_2story_FB_UA_GRG_AC1_UnitHeater_FuelTankWH.osw</filename>
111+
<filename>SFA_2story_UB_Furnace_RoomAC_FuelTankWH.osw</filename>
124112
<filetype>osw</filetype>
125113
<usage_type>test</usage_type>
126-
<checksum>6C58B3A3</checksum>
114+
<checksum>D29F7781</checksum>
127115
</file>
128116
<file>
129-
<filename>SFD_2story_FB_UA_GRG_GSHP_ElecTanklessWH.osw</filename>
117+
<filename>SFD_1story_FB_UA_GRG_MSHP_FuelTanklessWH.osw</filename>
130118
<filetype>osw</filetype>
131119
<usage_type>test</usage_type>
132-
<checksum>B3C0D697</checksum>
120+
<checksum>B9183037</checksum>
133121
</file>
134122
<file>
135-
<filename>SFD_2story_PB_UA_ElecFurnace_ElecTankWH.osw</filename>
123+
<filename>SFD_1story_FB_UA_GRG_RoomAC_ElecBoiler_FuelTanklessWH.osw</filename>
136124
<filetype>osw</filetype>
137125
<usage_type>test</usage_type>
138-
<checksum>E7CB80D0</checksum>
126+
<checksum>2B24F5CE</checksum>
139127
</file>
140128
<file>
141-
<filename>SFD_1story_UB_UA_GRG_ACV_FuelFurnace_PortableHeater_HPWH.osw</filename>
129+
<filename>SFD_1story_UB_UA_ASHP2_HPWH.osw</filename>
142130
<filetype>osw</filetype>
143131
<usage_type>test</usage_type>
144-
<checksum>546A7C2B</checksum>
132+
<checksum>C3A853FE</checksum>
145133
</file>
146134
<file>
147-
<filename>SFD_2story_S_UA_GRG_ASHP1_FuelTanklessWH.osw</filename>
135+
<filename>SFD_1story_UB_UA_GRG_ACV_FuelFurnace_HPWH.osw</filename>
148136
<filetype>osw</filetype>
149137
<usage_type>test</usage_type>
150-
<checksum>B165DD4B</checksum>
138+
<checksum>1974FC1B</checksum>
151139
</file>
152140
<file>
153-
<filename>SFD_2story_S_UA_GRG_ASHP1_Fireplace_FuelTanklessWH.osw</filename>
141+
<filename>SFD_1story_UB_UA_GRG_ACV_FuelFurnace_PortableHeater_HPWH.osw</filename>
154142
<filetype>osw</filetype>
155143
<usage_type>test</usage_type>
156-
<checksum>D58957CE</checksum>
144+
<checksum>546A7C2B</checksum>
157145
</file>
158146
<file>
159-
<filename>SFD_2story_S_UA_GRG_ASHP1_Fireplace_FuelTanklessWH_ERV.osw</filename>
147+
<filename>SFD_2story_CS_UA_AC2_FuelBoiler_FuelTankWH.osw</filename>
160148
<filetype>osw</filetype>
161149
<usage_type>test</usage_type>
162-
<checksum>B0E2610B</checksum>
150+
<checksum>B57303D3</checksum>
163151
</file>
164152
<file>
165-
<filename>SFD_1story_FB_UA_GRG_MSHP_FuelTanklessWH.osw</filename>
153+
<filename>SFD_2story_CS_UA_GRG_ASHPV_FuelTanklessWH.osw</filename>
166154
<filetype>osw</filetype>
167155
<usage_type>test</usage_type>
168-
<checksum>B9183037</checksum>
156+
<checksum>62034338</checksum>
169157
</file>
170158
<file>
171-
<filename>MF_1story_UB_Furnace_AC1_FuelTankWH.osw</filename>
159+
<filename>SFD_2story_FB_UA_GRG_AC1_ElecBaseboard_FuelTankWH.osw</filename>
172160
<filetype>osw</filetype>
173161
<usage_type>test</usage_type>
174-
<checksum>C68E5E17</checksum>
162+
<checksum>986E1AAD</checksum>
175163
</file>
176164
<file>
177-
<filename>MF_2story_UB_ASHP2_HPWH.osw</filename>
165+
<filename>SFD_2story_FB_UA_GRG_AC1_UnitHeater_FuelTankWH.osw</filename>
178166
<filetype>osw</filetype>
179167
<usage_type>test</usage_type>
180-
<checksum>06DE1BFA</checksum>
168+
<checksum>6C58B3A3</checksum>
181169
</file>
182170
<file>
183-
<filename>MF_2story_UB_FuelBoiler_AC1_FuelTankWH.osw</filename>
171+
<filename>SFD_2story_FB_UA_GRG_GSHP_ElecTanklessWH.osw</filename>
184172
<filetype>osw</filetype>
185173
<usage_type>test</usage_type>
186-
<checksum>216058F7</checksum>
174+
<checksum>B3C0D697</checksum>
187175
</file>
188176
<file>
189-
<filename>MF_2story_UB_Furnace_AC1_FuelTankWH.osw</filename>
177+
<filename>SFD_2story_PB_UA_ElecFurnace_ElecTankWH.osw</filename>
190178
<filetype>osw</filetype>
191179
<usage_type>test</usage_type>
192-
<checksum>A83A4562</checksum>
180+
<checksum>E7CB80D0</checksum>
193181
</file>
194182
<file>
195-
<filename>SFA_2story_FB_FuelBoiler_RoomAC_FuelTankWH.osw</filename>
183+
<filename>SFD_2story_S_UA_GRG_ASHP1_Fireplace_FuelTanklessWH.osw</filename>
196184
<filetype>osw</filetype>
197185
<usage_type>test</usage_type>
198-
<checksum>C959EBDB</checksum>
186+
<checksum>D58957CE</checksum>
199187
</file>
200188
<file>
201-
<filename>SFA_2story_UB_ASHP2_HPWH.osw</filename>
189+
<filename>SFD_2story_S_UA_GRG_ASHP1_Fireplace_FuelTanklessWH_ERV.osw</filename>
202190
<filetype>osw</filetype>
203191
<usage_type>test</usage_type>
204-
<checksum>4A5DA9E1</checksum>
192+
<checksum>B0E2610B</checksum>
205193
</file>
206194
<file>
207-
<filename>SFA_2story_UB_FuelBoiler_RoomAC_FuelTankWH.osw</filename>
195+
<filename>SFD_2story_S_UA_GRG_ASHP1_FuelTanklessWH.osw</filename>
208196
<filetype>osw</filetype>
209197
<usage_type>test</usage_type>
210-
<checksum>BC040D6A</checksum>
198+
<checksum>B165DD4B</checksum>
211199
</file>
212200
<file>
213-
<filename>SFA_2story_UB_Furnace_RoomAC_FuelTankWH.osw</filename>
214-
<filetype>osw</filetype>
201+
<filename>upgrade_costs_test.rb</filename>
202+
<filetype>rb</filetype>
215203
<usage_type>test</usage_type>
216-
<checksum>D29F7781</checksum>
204+
<checksum>01E4157F</checksum>
217205
</file>
218206
</files>
219207
</measure>

‎measures/UpgradeCosts/tests/upgrade_costs_test.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
require_relative '../../../measures/ReportHPXMLOutput/measure.rb'
66
require_relative '../measure.rb'
77

8-
class UpgradeCostsTest < MiniTest::Test
8+
class UpgradeCostsTest < Minitest::Test
99
def test_SFD_1story_FB_UA_GRG_MSHP_FuelTanklessWH
1010
cost_multipliers = {
1111
'Fixed (1)' => 1,

‎project_national/tests/test.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require_relative '../../resources/hpxml-measures/HPXMLtoOpenStudio/resources/minitest_helper'
44
require_relative '../../test/integrity_checks'
55

6-
class TestProjectNational < MiniTest::Test
6+
class TestProjectNational < Minitest::Test
77
def test_housing_characteristics
88
begin
99
project_dir_name = File.basename(File.dirname(File.dirname(__FILE__)))

‎project_testing/tests/test.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require_relative '../../resources/hpxml-measures/HPXMLtoOpenStudio/resources/minitest_helper'
44
require_relative '../../test/integrity_checks'
55

6-
class TestProjectTesting < MiniTest::Test
6+
class TestProjectTesting < Minitest::Test
77
def test_housing_characteristics
88
begin
99
project_dir_name = File.basename(File.dirname(File.dirname(__FILE__)))

‎resources/buildstock.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -543,13 +543,13 @@ def self._rm_path(path)
543543
end
544544

545545
class Version
546-
ResStock_Version = '3.1.0' # Version of ResStock
546+
ResStock_Version = '3.1.1' # Version of ResStock
547547
BuildStockBatch_Version = '2023.5.0' # Minimum required version of BuildStockBatch
548548

549549
def self.check_buildstockbatch_version
550550
if ENV.keys.include?('BUILDSTOCKBATCH_VERSION') # buildstockbatch is installed
551551
bsb_version = ENV['BUILDSTOCKBATCH_VERSION']
552-
if bsb_version < BuildStockBatch_Version
552+
if Gem::Version.new(bsb_version) < Gem::Version.new(BuildStockBatch_Version)
553553
fail "BuildStockBatch version #{BuildStockBatch_Version} or above is required. Found version: #{bsb_version}"
554554
end
555555
end

0 commit comments

Comments
 (0)