From ab5f3a3aeaf13c9bff7f321cf170b079900879ce Mon Sep 17 00:00:00 2001 From: Tim Coleman Date: Thu, 13 Oct 2022 15:39:23 -0600 Subject: [PATCH 1/6] test out 3.5.0-alpha --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 007e87d..0501be3 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.5.0-alpha') _ // Build for PR to develop branch only. if ((env.CHANGE_ID) && (env.CHANGE_TARGET) ) { // check if set From b5486316bbf41bfa1ea9e6e941ed428da73c5b40 Mon Sep 17 00:00:00 2001 From: Tim Coleman Date: Wed, 19 Oct 2022 13:25:00 -0600 Subject: [PATCH 2/6] test changes with latest extension gem and standards branch --- Gemfile | 5 +++++ openstudio-ee.gemspec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index c99db30..fc02b57 100644 --- a/Gemfile +++ b/Gemfile @@ -12,6 +12,11 @@ gemspec # checkout the latest version (develop) from github. allow_local = ENV['FAVOR_LOCAL_GEMS'] +# Delete when these branchesa are merged and released +gem 'openstudio-extension', github: 'NREL/OpenStudio-extension-gem', branch: 'v0.6.0-rc1' +gem 'openstudio-standards', '= 0.2.17.rc1', :github => 'NREL/openstudio-standards', :ref => '3.5.0_changes' + + # uncomment when you want CI to use develop branch of extension gem # gem 'openstudio-extension', github: 'NREL/OpenStudio-extension-gem', branch: 'develop' diff --git a/openstudio-ee.gemspec b/openstudio-ee.gemspec index a9a16b0..20e9514 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.5.1' - spec.add_dependency 'openstudio-standards', '~> 0.2.16' + spec.add_dependency 'openstudio-extension', '~> 0.6.0' + spec.add_dependency 'openstudio-standards', '~> 0.2.17.rc1' spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'rspec', '~> 3.9' From 1c72406b736fec0ddb9860563c29e6b9cc03f318 Mon Sep 17 00:00:00 2001 From: Tim Coleman Date: Wed, 19 Oct 2022 13:38:13 -0600 Subject: [PATCH 3/6] remove deprected method setDesignFlowRateCalculationMethod as this is now set on setDesignFlowRate method since v2.3.1 --- lib/measures/fan_assist_night_ventilation/measure.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/measures/fan_assist_night_ventilation/measure.rb b/lib/measures/fan_assist_night_ventilation/measure.rb index 3c7b25a..92e8d76 100644 --- a/lib/measures/fan_assist_night_ventilation/measure.rb +++ b/lib/measures/fan_assist_night_ventilation/measure.rb @@ -218,7 +218,6 @@ def run(model, runner, user_arguments) zone_ventilation.setName("PathStart_#{zone.name}") zone_ventilation.addToThermalZone(zone) zone_ventilation.setVentilationType('Exhaust') # switched from Natural to use power. Need to set fan properties. Used exhaust so no heat from fan in stream - zone_ventilation.setDesignFlowRateCalculationMethod('Flow/Zone') fraction_flow = design_flow_rate_si * zone_opp_area / bldg_area_counter zone_ventilation.setDesignFlowRate(fraction_flow) zone_design_flow_rate_ip = OpenStudio.convert(zone_ventilation.designFlowRate, 'm^3/s', 'cfm').get From 35d289110f9fba32dc0e5d3d85697c0ad4c92129 Mon Sep 17 00:00:00 2001 From: Tim Coleman Date: Mon, 31 Oct 2022 10:56:47 -0600 Subject: [PATCH 4/6] Update ref in jenkins --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0501be3..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.5.0-alpha') _ +@Library('cbci_shared_libs') _ // Build for PR to develop branch only. if ((env.CHANGE_ID) && (env.CHANGE_TARGET) ) { // check if set From 972c3874eb55acc2e7455fbae218660f8be030a4 Mon Sep 17 00:00:00 2001 From: Tim Coleman Date: Mon, 31 Oct 2022 14:07:28 -0600 Subject: [PATCH 5/6] updates for ext gem and standards rc releases --- Gemfile | 4 ++-- openstudio-ee.gemspec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index fc02b57..333f583 100644 --- a/Gemfile +++ b/Gemfile @@ -13,8 +13,8 @@ gemspec allow_local = ENV['FAVOR_LOCAL_GEMS'] # Delete when these branchesa are merged and released -gem 'openstudio-extension', github: 'NREL/OpenStudio-extension-gem', branch: 'v0.6.0-rc1' -gem 'openstudio-standards', '= 0.2.17.rc1', :github => 'NREL/openstudio-standards', :ref => '3.5.0_changes' +#gem 'openstudio-extension', github: 'NREL/OpenStudio-extension-gem', branch: 'v0.6.0-rc1' +#gem 'openstudio-standards', '= 0.2.17.rc1', :github => 'NREL/openstudio-standards', :ref => '3.5.0_changes' # uncomment when you want CI to use develop branch of extension gem diff --git a/openstudio-ee.gemspec b/openstudio-ee.gemspec index 20e9514..6be3022 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.6.0' - spec.add_dependency 'openstudio-standards', '~> 0.2.17.rc1' + spec.add_dependency 'openstudio-extension', '~> 0.6.0.rc1' + spec.add_dependency 'openstudio-standards', '~> 0.2.17.rc2' spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'rspec', '~> 3.9' From 4cd578439174ee952916828b70537ee8a2a1b3f9 Mon Sep 17 00:00:00 2001 From: kflemin <2205659+kflemin@users.noreply.github.com> Date: Tue, 15 Nov 2022 16:01:26 -0700 Subject: [PATCH 6/6] update readme, changelog, version, and gemspec for version 0.7.0 --- CHANGELOG.md | 3 +++ README.md | 1 + lib/openstudio/ee_measures/version.rb | 2 +- openstudio-ee.gemspec | 4 ++-- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 47870c1..20f0982 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # OpenStudio EE Gem +## Version 0.7.0 +* Support for OpenStudio 3.5 (upgrade to standards gem 0.3.0, extension gem 0.6.0) + ## Version 0.6.0 * Support for OpenStudio 3.4 (upgrade to standards gem 0.2.16, no extension gem upgrade) diff --git a/README.md b/README.md index 145fbc3..2649f26 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ Or install it yourself as: |OpenStudio EE Gem|OpenStudio|Ruby| |:--------------:|:----------:|:--------:| +| 0.7.0 | 3.5 | 2.7 | | 0.6.0 | 3.4 | 2.7 | | 0.5.0 | 3.3 | 2.7 | | 0.4.0 | 3.2 | 2.7 | diff --git a/lib/openstudio/ee_measures/version.rb b/lib/openstudio/ee_measures/version.rb index 07078c8..f0e1421 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.6.0' + VERSION = '0.7.0' end end diff --git a/openstudio-ee.gemspec b/openstudio-ee.gemspec index 6be3022..5d9ca3e 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.6.0.rc1' - spec.add_dependency 'openstudio-standards', '~> 0.2.17.rc2' + spec.add_dependency 'openstudio-extension', '~> 0.6.0' + spec.add_dependency 'openstudio-standards', '~> 0.3.0' spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'rspec', '~> 3.9'