Gemfile in urbanopt-scenario-0.2.0 vs Gemfile in urbanopt-scenario-0.3.0.pre1
- old
+ new
@@ -9,24 +9,24 @@
# Windows: set FAVOR_LOCAL_GEMS=1
# Note that if allow_local is true, but the gem is not found locally, then it will
# checkout the latest version (develop) from github.
allow_local = ENV['FAVOR_LOCAL_GEMS']
-# Uncomment the extension and common measures gem if you need to test local development versions. Otherwise
-# these are included in the model articulation gem.
+# Uncomment the extension gem if you need to test local development versions. Otherwise
+# is is included in the model articulation gem.
#
# if allow_local && File.exist?('../OpenStudio-extension-gem')
# gem 'openstudio-extension', path: '../OpenStudio-extension-gem'
# elsif allow_local
# gem 'openstudio-extension', github: 'NREL/OpenStudio-extension-gem', branch: 'develop'
# end
-# if allow_local && File.exist?('../openstudio-common-measures-gem')
-# gem 'openstudio-common-measures', path: '../openstudio-common-measures-gem'
-# elsif allow_local
-# gem 'openstudio-common-measures', github: 'NREL/openstudio-common-measures-gem', branch: 'develop'
-# end
+if allow_local && File.exist?('../openstudio-common-measures-gem')
+ gem 'openstudio-common-measures', path: '../openstudio-common-measures-gem'
+elsif allow_local
+ gem 'openstudio-common-measures', github: 'NREL/openstudio-common-measures-gem', branch: 'develop'
+end
if allow_local && File.exist?('../openstudio-model-articulation-gem')
gem 'openstudio-model-articulation', path: '../openstudio-model-articulation-gem'
elsif allow_local
gem 'openstudio-model-articulation', github: 'NREL/openstudio-model-articulation-gem', branch: 'develop'
@@ -35,8 +35,5 @@
if allow_local && File.exist?('../urbanopt-core-gem')
gem 'urbanopt-core', path: '../urbanopt-core-gem'
elsif allow_local
gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'develop'
end
-
-# simplecov has an unnecessary dependency on native json gem, use fork that does not require this
-gem 'simplecov', github: 'NREL/simplecov'