From 1a5373cc90da4c75343a67a923a0453145b63ebc Mon Sep 17 00:00:00 2001 From: Tim Coleman Date: Wed, 9 Jun 2021 20:35:35 -0600 Subject: [PATCH 01/10] update rubocop to use v4. bump standards to 0.2.14 and extension-gem to 0.4.3. use OS 3.2.1-rc1 to test --- .rubocop.yml | 4 +++- Jenkinsfile | 11 ++++++----- openstudio-ee.gemspec | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 091cd65..1b9bd97 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,5 +1,7 @@ AllCops: Exclude: - 'spec/test_measures/**/*' + +require: rubocop-performance inherit_from: - - http://s3.amazonaws.com/openstudio-resources/styles/rubocop_v3.yml + - http://s3.amazonaws.com/openstudio-resources/styles/rubocop_v4.yml diff --git a/Jenkinsfile b/Jenkinsfile index 6e6dc80..a006d6e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,10 +1,11 @@ -//Jenkins pipelines are stored in shared libaries. Please see: https://github.com/tijcolem/nrel_cbci_jenkins_libs +//Jenkins pipelines are stored in shared libraries. Please see: https://github.com/NREL/cbci_jenkins_libs + +@Library('cbci_shared_libs@3.2.1-rc1') _ -@Library('cbci_shared_libs') _ - -// Build for PR to develop branch only. +// Build for PR to develop branch only. if ((env.CHANGE_ID) && (env.CHANGE_TARGET) ) { // check if set openstudio_extension_gems() + +} -} \ No newline at end of file diff --git a/openstudio-ee.gemspec b/openstudio-ee.gemspec index ff07296..7113d16 100644 --- a/openstudio-ee.gemspec +++ b/openstudio-ee.gemspec @@ -28,8 +28,8 @@ Gem::Specification.new do |spec| spec.required_ruby_version = '~> 2.7.0' spec.add_dependency 'bundler', '~> 2.1' - spec.add_dependency 'openstudio-extension', '~> 0.4.2' - spec.add_dependency 'openstudio-standards', '~> 0.2.13' + spec.add_dependency 'openstudio-extension', '~> 0.4.3' + spec.add_dependency 'openstudio-standards', '~> 0.2.14' spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'rspec', '~> 3.9' From 12c8c052a50f9a52bce1517baabe93b60ac46efd Mon Sep 17 00:00:00 2001 From: Tim Coleman Date: Fri, 9 Jul 2021 09:41:25 -0600 Subject: [PATCH 02/10] ref master branch in cbci_shared_libs for Jenkins pipelines --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index a006d6e..007e87d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,6 @@ //Jenkins pipelines are stored in shared libraries. Please see: https://github.com/NREL/cbci_jenkins_libs -@Library('cbci_shared_libs@3.2.1-rc1') _ +@Library('cbci_shared_libs') _ // Build for PR to develop branch only. if ((env.CHANGE_ID) && (env.CHANGE_TARGET) ) { // check if set From e4d96ade43753fca16b0aecc8575cde75c4f5be8 Mon Sep 17 00:00:00 2001 From: kflemin Date: Fri, 17 Sep 2021 13:59:36 -0600 Subject: [PATCH 03/10] adding compatibility matrix and contribution policy --- README.md | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index dcba9d5..fc82bb8 100644 --- a/README.md +++ b/README.md @@ -19,13 +19,19 @@ Or install it yourself as: $ gem install 'openstudio-ee-measures' -## Usage +# Compatibility Matrix -To be filled out later. +|OpenStudio EE Gem|OpenStudio|Ruby| +|:--------------:|:----------:|:--------:| +| 0.4.0 | 3.2 | 2.7 | +| 0.3.0 - 0.3.2 | 3.1 | 2.5 | +| 0.2.0 - 0.2.1 | 3.0 | 2.5 | +| 0.1.0 | 2.9 | 2.2.4 | -## TODO +# Contributing + +Please review the [OpenStudio Contribution Policy](https://openstudio.net/openstudio-contribution-policy) if you would like to contribute code to this gem. -- [x] Remove measures from OpenStudio-Measures to standardize on this location # Releasing From 38030bb97f00d38d7c0cbd6228b83382c463f4fd Mon Sep 17 00:00:00 2001 From: Tim Coleman Date: Thu, 7 Oct 2021 21:21:52 -0600 Subject: [PATCH 04/10] test on OpenStudio v3.3.0-alpha --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 007e87d..3d3148a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,6 @@ //Jenkins pipelines are stored in shared libraries. Please see: https://github.com/NREL/cbci_jenkins_libs -@Library('cbci_shared_libs') _ +@Library('cbci_shared_libs@3.3.0-alpha') _ // Build for PR to develop branch only. if ((env.CHANGE_ID) && (env.CHANGE_TARGET) ) { // check if set From 675c7fb579736b3689e159ab0d52f62b7a357e32 Mon Sep 17 00:00:00 2001 From: David Goldwasser Date: Fri, 8 Oct 2021 10:31:13 -0600 Subject: [PATCH 05/10] updating remove_hvac in net zero HVAC measure --- lib/measures/nze_hvac/measure.rb | 2 +- lib/measures/nze_hvac/measure.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/measures/nze_hvac/measure.rb b/lib/measures/nze_hvac/measure.rb index 5cbe113..651f59d 100644 --- a/lib/measures/nze_hvac/measure.rb +++ b/lib/measures/nze_hvac/measure.rb @@ -369,7 +369,7 @@ def run(model, runner, user_arguments) # remove existing hvac system from model if remove_existing_hvac runner.registerInfo('Removing existing HVAC systems from the model') - std.remove_HVAC(model) + std.remove_hvac(model) end # exclude plenum zones, zones without thermostats, and zones with no floor area diff --git a/lib/measures/nze_hvac/measure.xml b/lib/measures/nze_hvac/measure.xml index 434aeb9..c6cb87a 100644 --- a/lib/measures/nze_hvac/measure.xml +++ b/lib/measures/nze_hvac/measure.xml @@ -3,8 +3,8 @@ 3.0 nze_hvac f060dff2-b28d-4194-a6af-e66d88ddb33c - 7697ad4e-7392-40cd-aa0d-ba4163efd1c3 - 20210423T162015Z + f0d3bc5d-1308-4430-8afd-daf6e0aa1b1c + 20211008T163053Z 0E5E4776 NzeHvac NZEHVAC @@ -324,7 +324,7 @@ measure.rb rb script - 59C3DBB0 + EE9C669A From 06ab10ed9e173d2f93c97e0c64c567fc1e7d74db Mon Sep 17 00:00:00 2001 From: Tim Coleman Date: Fri, 8 Oct 2021 13:04:08 -0600 Subject: [PATCH 06/10] update standards to 0.2.15.pre.rc1 and extension gem to 0.4.4 --- openstudio-ee.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openstudio-ee.gemspec b/openstudio-ee.gemspec index 7113d16..ca43f36 100644 --- a/openstudio-ee.gemspec +++ b/openstudio-ee.gemspec @@ -28,8 +28,8 @@ Gem::Specification.new do |spec| spec.required_ruby_version = '~> 2.7.0' spec.add_dependency 'bundler', '~> 2.1' - spec.add_dependency 'openstudio-extension', '~> 0.4.3' - spec.add_dependency 'openstudio-standards', '~> 0.2.14' + spec.add_dependency 'openstudio-extension', '~> 0.4.4' + spec.add_dependency 'openstudio-standards', '~> 0.2.15.pre.rc1' spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'rspec', '~> 3.9' From c82eef7da4e1e48d9ad584a8fc552dda3b5ba802 Mon Sep 17 00:00:00 2001 From: David Goldwasser Date: Wed, 3 Nov 2021 15:13:05 -0600 Subject: [PATCH 07/10] reverted jenkins to cbci_shared_libs --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3d3148a..007e87d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,6 @@ //Jenkins pipelines are stored in shared libraries. Please see: https://github.com/NREL/cbci_jenkins_libs -@Library('cbci_shared_libs@3.3.0-alpha') _ +@Library('cbci_shared_libs') _ // Build for PR to develop branch only. if ((env.CHANGE_ID) && (env.CHANGE_TARGET) ) { // check if set From ff8aab63b8e0cb6f85216143deec388edc7b20b6 Mon Sep 17 00:00:00 2001 From: David Goldwasser Date: Thu, 4 Nov 2021 10:57:39 -0600 Subject: [PATCH 08/10] require 3.3.0 or later for nze_hvac --- lib/measures/nze_hvac/measure.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/measures/nze_hvac/measure.xml b/lib/measures/nze_hvac/measure.xml index c6cb87a..413fd8d 100644 --- a/lib/measures/nze_hvac/measure.xml +++ b/lib/measures/nze_hvac/measure.xml @@ -3,8 +3,8 @@ 3.0 nze_hvac f060dff2-b28d-4194-a6af-e66d88ddb33c - f0d3bc5d-1308-4430-8afd-daf6e0aa1b1c - 20211008T163053Z + d3dd0dce-6bc5-4626-9665-ff612d3a1e26 + 20211104T165713Z 0E5E4776 NzeHvac NZEHVAC @@ -319,7 +319,7 @@ OpenStudio 2.9.0 - 2.9.0 + 3.3.0 measure.rb rb From aba37d0f2a505e5d79276a698dd406dbbe832b60 Mon Sep 17 00:00:00 2001 From: David Goldwasser Date: Fri, 5 Nov 2021 16:43:10 -0600 Subject: [PATCH 09/10] correcting version of ext and standards gem --- openstudio-ee.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openstudio-ee.gemspec b/openstudio-ee.gemspec index ca43f36..7315d91 100644 --- a/openstudio-ee.gemspec +++ b/openstudio-ee.gemspec @@ -28,8 +28,8 @@ Gem::Specification.new do |spec| spec.required_ruby_version = '~> 2.7.0' spec.add_dependency 'bundler', '~> 2.1' - spec.add_dependency 'openstudio-extension', '~> 0.4.4' - spec.add_dependency 'openstudio-standards', '~> 0.2.15.pre.rc1' + spec.add_dependency 'openstudio-extension', '~> 0.5.1' + spec.add_dependency 'openstudio-standards', '~> 0.2.15' spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'rspec', '~> 3.9' From ad4b0466d91a1fa26d83a8cd9c6280419742f98d Mon Sep 17 00:00:00 2001 From: David Goldwasser Date: Fri, 5 Nov 2021 16:55:16 -0600 Subject: [PATCH 10/10] @nllong Thanks for catching this, These are the last files that should need to change. CI will run for an hour or so on this. Then should be ready for release. --- CHANGELOG.md | 5 +++++ README.md | 1 + lib/openstudio/ee_measures/version.rb | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ff6b9c..f6dc159 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # OpenStudio EE Gem +## 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 +* Fixed [#32]( https://github.com/NREL/openstudio-ee-gem/pull/32 ), adding compatibility matrix and contribution policy + ## Version 0.4.0 * Support Ruby ~> 2.7 diff --git a/README.md b/README.md index fc82bb8..e670e1f 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ Or install it yourself as: |OpenStudio EE Gem|OpenStudio|Ruby| |:--------------:|:----------:|:--------:| +| 0.5.0 | 3.3 | 2.7 | | 0.4.0 | 3.2 | 2.7 | | 0.3.0 - 0.3.2 | 3.1 | 2.5 | | 0.2.0 - 0.2.1 | 3.0 | 2.5 | diff --git a/lib/openstudio/ee_measures/version.rb b/lib/openstudio/ee_measures/version.rb index 3baf16a..a7d80af 100644 --- a/lib/openstudio/ee_measures/version.rb +++ b/lib/openstudio/ee_measures/version.rb @@ -37,6 +37,6 @@ module OpenStudio module EeMeasures - VERSION = '0.4.0' + VERSION = '0.5.0' end end