From 49ef2082378f3190d212deff2cbb269a8e36e470 Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Mon, 20 Nov 2023 13:06:28 -0600 Subject: [PATCH 1/3] branches for os37 --- Gemfile | 12 ++++++------ openstudio-geb.gemspec | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index 9558a3d..5bf9383 100644 --- a/Gemfile +++ b/Gemfile @@ -10,11 +10,11 @@ gemspec # checkout the latest version (develop) from github. allow_local = ENV['FAVOR_LOCAL_GEMS'] -if allow_local && File.exists?('../OpenStudio-extension-gem') - gem 'openstudio-extension', path: '../OpenStudio-extension-gem' -else - gem 'openstudio-extension', github: 'NREL/OpenStudio-extension-gem', branch: 'develop' -end +# if allow_local && File.exists?('../OpenStudio-extension-gem') +# gem 'openstudio-extension', path: '../OpenStudio-extension-gem' +# else +# gem 'openstudio-extension', github: 'NREL/OpenStudio-extension-gem', branch: 'develop' +# end gem 'openstudio_measure_tester', '= 0.3.1' # This includes the dependencies for running unit tests, coverage, and rubocop @@ -24,4 +24,4 @@ gem 'simplecov', '~> 0.18.2' # pin this dependency to avoid unicode_normalize error gem 'addressable', '2.8.1' # pin this dependency to avoid using racc dependency (which has native extensions) -gem 'parser', '3.2.2.2' \ No newline at end of file +gem 'parser', '3.2.2.2' diff --git a/openstudio-geb.gemspec b/openstudio-geb.gemspec index 2618ac8..9fce998 100644 --- a/openstudio-geb.gemspec +++ b/openstudio-geb.gemspec @@ -27,6 +27,6 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'rspec', '3.7.0' spec.add_development_dependency 'rubocop', '~> 1.15.0' - spec.add_dependency 'openstudio-extension', '~> 0.6.1' - spec.add_dependency 'openstudio-standards', '~> 0.4.0' + spec.add_dependency 'openstudio-extension', '~> 0.7.0' + spec.add_dependency 'openstudio-standards', '~> 0.5.0' end From 963e1704776d07775e1aeb3adf226d0393b69ad4 Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Wed, 13 Dec 2023 16:01:19 -0700 Subject: [PATCH 2/3] bump version and update changelog to match --- CHANGELOG.md | 5 ++++- lib/openstudio/geb/version.rb | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e33a909..cc52488 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # OpenStudio GEB Gem +## Version 0.4.0 +- Support for OpenStudio 3.7 (upgrade to standards gem 0.5.0, extension gem 0.7.0) + ## Version 0.3.0 - Support for OpenStudio 3.6 (upgrade to standards gem 0.4.0, extension gem 0.6.1) @@ -13,4 +16,4 @@ ## Versions 0.1.0 and 0.1.1 -- Initial releases \ No newline at end of file +- Initial releases diff --git a/lib/openstudio/geb/version.rb b/lib/openstudio/geb/version.rb index 682f7e4..1912b53 100644 --- a/lib/openstudio/geb/version.rb +++ b/lib/openstudio/geb/version.rb @@ -5,6 +5,6 @@ module OpenStudio module Geb - VERSION = '0.3.3'.freeze + VERSION = '0.4.0'.freeze end end From 8bda25338bfc54856ef7d52cf906edc7aad7fc8b Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Wed, 13 Dec 2023 16:05:45 -0700 Subject: [PATCH 3/3] un-comment some gemfile lines --- Gemfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 5bf9383..10a1619 100644 --- a/Gemfile +++ b/Gemfile @@ -10,11 +10,11 @@ gemspec # checkout the latest version (develop) from github. allow_local = ENV['FAVOR_LOCAL_GEMS'] -# if allow_local && File.exists?('../OpenStudio-extension-gem') -# gem 'openstudio-extension', path: '../OpenStudio-extension-gem' -# else -# gem 'openstudio-extension', github: 'NREL/OpenStudio-extension-gem', branch: 'develop' -# end +if allow_local && File.exists?('../OpenStudio-extension-gem') + gem 'openstudio-extension', path: '../OpenStudio-extension-gem' +else + gem 'openstudio-extension', github: 'NREL/OpenStudio-extension-gem', branch: 'develop' +end gem 'openstudio_measure_tester', '= 0.3.1' # This includes the dependencies for running unit tests, coverage, and rubocop