Skip to content

Commit d36fb4e

Browse files
committed
update dependencies to working versions for OS3.10
1 parent 8b11fc7 commit d36fb4e

3 files changed

Lines changed: 16 additions & 22 deletions

File tree

Gemfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,13 @@ allow_local = ENV['FAVOR_LOCAL_GEMS']
1313

1414
# Uncomment (and modify path/branch) if you need to test local development versions. Otherwise
1515
# these are included in the gemspec file
16-
17-
# Delete this once testing is complete!
18-
# gem 'bcl', github: 'NREL/bcl-gem', branch: 'faraday'
19-
gem 'bcl', '~> 0.9.1'
2016
#
2117
# if allow_local && File.exist?('../OpenStudio-extension-gem')
2218
# gem 'openstudio-extension', path: '../OpenStudio-extension-gem'
2319
# elsif allow_local
2420
# gem 'openstudio-extension', github: 'NREL/OpenStudio-extension-gem', branch: 'faraday'
2521
# end
26-
gem 'openstudio-extension', '0.9.1'
22+
gem 'openstudio-extension', '0.9.3'
2723

2824
gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'faraday'
2925

example_files/Gemfile

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,13 @@ allow_local = ENV['FAVOR_LOCAL_GEMS']
1212

1313
# Uncomment the extension, core gems if you need to test local development versions. Otherwise
1414
# these are included in the model articulation and urbanopt gems
15-
16-
# Delete this once testing is complete!
17-
# gem 'bcl', github: 'NREL/bcl-gem', branch: 'faraday'
18-
gem 'bcl', '~> 0.9.1'
1915
#
2016
# if allow_local && File.exist?('../OpenStudio-extension-gem')
2117
# gem 'openstudio-extension', path: '../OpenStudio-extension-gem'
2218
# elsif allow_local
2319
# gem 'openstudio-extension', github: 'NREL/openstudio-extension-gem', branch: 'faraday'
2420
# else
25-
gem 'openstudio-extension', '~> 0.9.1'
21+
gem 'openstudio-extension', '~> 0.9.3'
2622
# end
2723

2824
# if allow_local && File.exist?('../urbanopt-core-gem')
@@ -34,49 +30,49 @@ gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'faraday'
3430
# if allow_local && File.exist?('../openstudio-common-measures-gem')
3531
# gem 'openstudio-common-measures', path: '../../openstudio-common-measures-gem'
3632
# elsif allow_local
37-
gem 'openstudio-common-measures', github: 'NREL/openstudio-common-measures-gem', branch: 'faraday'
33+
# gem 'openstudio-common-measures', github: 'NREL/openstudio-common-measures-gem', branch: 'faraday'
3834
# else
39-
# gem 'openstudio-common-measures', '~> 0.11.1'
35+
gem 'openstudio-common-measures', '~> 0.12.3'
4036
# end
4137

4238
# if allow_local && File.exist?('../openstudio-model-articulation-gem')
4339
# gem 'openstudio-model-articulation', path: '../openstudio-model-articulation-gem'
4440
# elsif allow_local
45-
gem 'openstudio-model-articulation', github: 'NREL/openstudio-model-articulation-gem', branch: 'faraday'
41+
# gem 'openstudio-model-articulation', github: 'NREL/openstudio-model-articulation-gem', branch: 'faraday'
4642
# else
47-
# gem 'openstudio-model-articulation', '~> 0.11.1'
43+
gem 'openstudio-model-articulation', '~> 0.12.2'
4844
# end
4945

5046
# if allow_local && File.exist?('../openstudio-load-flexibility-measures-gem')
5147
# gem 'openstudio-load-flexibility-measures', path: '../openstudio-load-flexibility-measures-gem'
5248
# elsif allow_local
53-
gem 'openstudio-load-flexibility-measures', github: 'NREL/openstudio-load-flexibility-measures-gem', branch: 'faraday'
49+
# gem 'openstudio-load-flexibility-measures', github: 'NREL/openstudio-load-flexibility-measures-gem', branch: 'faraday'
5450
# else
55-
# gem 'openstudio-load-flexibility-measures', '~> 0.10.1'
51+
gem 'openstudio-load-flexibility-measures', '~> 0.11.1'
5652
# end
5753

5854
# if allow_local && File.exist?('../openstudio-ee-gem')
5955
# gem 'openstudio-ee', path: '../openstudio-ee-gem'
6056
# elsif allow_local
61-
gem 'openstudio-ee', github: 'NREL/openstudio-ee-gem', branch: 'faraday'
57+
# gem 'openstudio-ee', github: 'NREL/openstudio-ee-gem', branch: 'faraday'
6258
# else
63-
# gem 'openstudio-ee', '~> 0.11.1'
59+
gem 'openstudio-ee', '~> 0.12.3'
6460
# end
6561

6662
# if allow_local && File.exist?('../openstudio-calibration-gem')
6763
# gem 'openstudio-calibration', path: '../openstudio-calibration-gem'
6864
# elsif allow_local
69-
gem 'openstudio-calibration', github: 'NREL/openstudio-calibration-gem', branch: 'faraday'
65+
# gem 'openstudio-calibration', github: 'NREL/openstudio-calibration-gem', branch: 'faraday'
7066
# else
71-
# gem 'openstudio-calibration', '~> 0.11.1'
67+
gem 'openstudio-calibration', '~> 0.12.2'
7268
# end
7369

7470
# if allow_local && File.exist?('../../openstudio-geb')
7571
# gem 'openstudio-geb', path: '../../../openstudio-geb-gem'
7672
# elsif allow_local
77-
gem 'openstudio-geb', github: 'LBNL-ETA/openstudio-geb-gem', branch: 'faraday'
73+
# gem 'openstudio-geb', github: 'LBNL-ETA/openstudio-geb-gem', branch: 'faraday'
7874
# else
79-
# gem 'openstudio-geb', '~> 0.6.0'
75+
gem 'openstudio-geb', '~> 0.7.0'
8076
# end
8177

8278
# if allow_local && File.exist?('../urbanopt-geojson-gem')

uo_cli.gemspec

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ Gem::Specification.new do |spec|
4040
# spec.add_runtime_dependency 'urbanopt-rnm-us', '~> 1.0.0'
4141
# spec.add_runtime_dependency 'urbanopt-scenario', '~> 1.0.0'
4242

43+
spec.add_development_dependency 'rake', '~> 13.0'
44+
spec.add_development_dependency 'rubocop', '~> 1.50'
4345
spec.add_development_dependency 'rspec', '~> 3.13'
4446
spec.add_development_dependency 'simplecov', '0.22.0'
4547
spec.add_development_dependency 'simplecov-lcov', '0.8.0'

0 commit comments

Comments
 (0)