Skip to content

Commit

Permalink
use os39 branches for testing
Browse files Browse the repository at this point in the history
  • Loading branch information
vtnate committed Nov 13, 2024
1 parent 29ceaa1 commit 8ee628b
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 20 deletions.
13 changes: 6 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ allow_local = ENV['FAVOR_LOCAL_GEMS']

# 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'

# Uncomment (and modify path/branch) if you need to test local development versions. Otherwise
# these are included in the gemspec file
Expand All @@ -24,33 +22,34 @@ gem 'parser', '3.2.2.2'
# elsif allow_local
# gem 'openstudio-extension', github: 'NREL/OpenStudio-extension-gem', branch: 'develop'
# end
gem 'openstudio-extension', '0.8.2'

# if allow_local && File.exist?('../urbanopt-scenario-gem')
# gem 'urbanopt-scenario', path: '../urbanopt-scenario-gem'
# elsif allow_local
# gem 'urbanopt-scenario', github: 'URBANopt/urbanopt-scenario-gem', branch: 'develop'
gem 'urbanopt-scenario', github: 'URBANopt/urbanopt-scenario-gem', branch: 'os39'
# end

# if allow_local && File.exist?('../urbanopt-geojson-gem')
# gem 'urbanopt-geojson', path: '../urbanopt-geojson-gem'
# elsif allow_local
# gem 'urbanopt-geojson', github: 'URBANopt/urbanopt-geojson-gem', branch: 'develop'
gem 'urbanopt-geojson', github: 'URBANopt/urbanopt-geojson-gem', branch: 'os39'
# end

# if allow_local && File.exist?('../urbanopt-reopt-gem')
# gem 'urbanopt-reopt', path: '../urbanopt-reopt-gem'
# elsif allow_local
# gem 'urbanopt-reopt', github: 'URBANopt/urbanopt-reopt-gem', branch: 'develop'
gem 'urbanopt-reopt', github: 'URBANopt/urbanopt-reopt-gem', branch: 'os39'
# end

# if allow_local && File.exist?('../urbanopt-reporting-gem')
# gem 'urbanopt-reporting', path: '../urbanopt-reporting-gem'
# elsif allow_local
# gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'develop'
gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'os39'
# end

# if allow_local && File.exist?('../urbanopt-rnm-us-gem')
# gem 'urbanopt-rnm-us', path: '../urbanopt-rnm-us-gem'
# elsif allow_local
# gem 'urbanopt-rnm-us', github: 'URBANopt/urbanopt-rnm-us-gem', branch: 'develop'
gem 'urbanopt-rnm-us', github: 'URBANopt/urbanopt-rnm-us-gem', branch: 'os39'
# end
23 changes: 10 additions & 13 deletions uo_cli.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,17 @@ Gem::Specification.new do |spec|
spec.bindir = 'bin'
spec.executables = ['uo']
spec.require_paths = ['lib', 'example_files']
spec.required_ruby_version = '~> 2.7.0'
spec.required_ruby_version = '3.2.2'

# use specific versions of urbanopt and openstudio dependencies while under heavy development
spec.add_runtime_dependency 'optimist', '~> 3'
spec.add_runtime_dependency 'urbanopt-geojson', '~> 0.11.2'
spec.add_runtime_dependency 'urbanopt-reopt', '~> 0.12.0'
spec.add_runtime_dependency 'urbanopt-reporting', '~> 0.10.1'
spec.add_runtime_dependency 'urbanopt-rnm-us', '~> 0.7.0'
spec.add_runtime_dependency 'urbanopt-scenario', '~> 0.12.0'
spec.add_runtime_dependency 'optimist', '~> 3.2'
# spec.add_runtime_dependency 'urbanopt-geojson', '~> 0.11.2'
# spec.add_runtime_dependency 'urbanopt-reopt', '~> 0.12.0'
# spec.add_runtime_dependency 'urbanopt-reporting', '~> 0.10.1'
# spec.add_runtime_dependency 'urbanopt-rnm-us', '~> 0.7.0'
# spec.add_runtime_dependency 'urbanopt-scenario', '~> 0.12.0'

spec.add_development_dependency 'bundler', '~> 2.1'
spec.add_development_dependency 'rake', '~> 13.0'
spec.add_development_dependency 'rspec', '~> 3.9'
spec.add_development_dependency 'rubocop', '~> 1.15.0'
spec.add_development_dependency 'rubocop-checkstyle_formatter', '~> 0.4.0'
spec.add_development_dependency 'rubocop-performance', '~> 1.11.3'
spec.add_development_dependency 'rspec', '~> 3.13'
spec.add_development_dependency 'simplecov', '0.22.0'
spec.add_development_dependency 'simplecov-lcov', '0.8.0'
end

0 comments on commit 8ee628b

Please sign in to comment.