Skip to content

Commit

Permalink
branches for os37
Browse files Browse the repository at this point in the history
  • Loading branch information
vtnate committed Nov 20, 2023
1 parent ecca63b commit 49ef208
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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'
gem 'parser', '3.2.2.2'
4 changes: 2 additions & 2 deletions openstudio-geb.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 49ef208

Please sign in to comment.