Merge pull request #430 from urbanopt/os361

Os361

.github/workflows/nightly_build.yml → .github/workflows/nightly_ci_build.yml

@@ -1,11 +1,11 @@
 name: nightly_build
 
 on:
-  # push:
-  schedule:
+  push:
+  # schedule:
     # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule
     # 5:24 am UTC (11:24pm MDT the day before) every weekday night in MDT
-    - cron: '24 5 * * 2-6'
+    # - cron: '24 5 * * 2-6'
 
 env:
   # Favor_Local_Gems enforces develop branch of all Ruby dependencies
@@ -23,7 +23,7 @@ jobs:
     # https://github.com/rbenv/ruby-build/discussions/1940
     runs-on: ubuntu-latest
     container:
-      image: docker://nrel/openstudio:3.5.1
+      image: docker://nrel/openstudio:3.6.1
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python
@@ -45,7 +45,8 @@ jobs:
       - name: Upload artifacts
       # Save results for examination - useful for debugging
         uses: actions/upload-artifact@v3
-        if: failure() # Only upload if rspec fails
+        # Only upload if rspec fails
+        if: failure()
         with:
           name: rspec_results
           path: |

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## Version 0.10.0
+Date Range: 06/14/22 - 7/20/23
+
+- Update dependencies for OpenStudio 3.6.1
+- Update license and references to the license file
+- Add badge for GHA CI nightly build status
+- Fixed [#424]( https://github.com/urbanopt/urbanopt-cli/pull/424 ), allow geojson file type as well as json for feature files
+- Fixed [#425]( https://github.com/urbanopt/urbanopt-cli/pull/425 ), Update gmt version
+
 ## Version 0.9.3
 Date Range: 04/11/23 - 06/14/23:
 
@@ -21,12 +30,12 @@ Date Range: 12/14/22 - 01/05/23:
 Date Range: 07/07/22 - 12/13/22:
 
 - Fixed [#305]( https://github.com/urbanopt/urbanopt-cli/issues/305 ), Expand RNM to OpenDSS connection
-- Fixed [#330]( https://github.com/urbanopt/urbanopt-cli/issues/330 ), Create a UO CLI command to install DISCO 
+- Fixed [#330]( https://github.com/urbanopt/urbanopt-cli/issues/330 ), Create a UO CLI command to install DISCO
 - Fixed [#331]( https://github.com/urbanopt/urbanopt-cli/issues/331 ), Install Miniconda Python, pip, and Python dependencies within urbanopt installation
 - Fixed [#361]( https://github.com/urbanopt/urbanopt-cli/issues/361 ), CLI command to update an existing project to latest URBANopt version
 - Fixed [#380]( https://github.com/urbanopt/urbanopt-cli/issues/380 ), Better error handling of uo create command
 - New Feature - Initial DISCO integration
-- CLI command for Class Project creation 
+- CLI command for Class Project creation
 - Added RNM flag to OpenDSS command for processing RNM-US DSS files
 - New Feature - 3 GEB scenarios: add chilled water storage, EPD reduction during Peak Hours, Adjust Thermostat during Peak Hours
 - Updated dependencies for OpenStudio 3.5.0 and HPXML 1.5.0

Gemfile

@@ -11,6 +11,11 @@ gemspec
 # checkout the latest version (develop) from github.
 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
 #
@@ -22,13 +27,10 @@ allow_local = ENV['FAVOR_LOCAL_GEMS']
 
 # if allow_local && File.exist?('../urbanopt-scenario-gem')
 #  gem 'urbanopt-scenario', path: '../urbanopt-scenario-gem'
-# TODO: COMMENT OUT AFTER RELEASE OF GEM
 # elsif allow_local
-#  gem 'urbanopt-scenario', github: 'URBANopt/urbanopt-scenario-gem', branch: 'develop'
+# gem 'urbanopt-scenario', github: 'URBANopt/urbanopt-scenario-gem', branch: 'develop'
 # end
 
-# TODO : Uncomment to revert changes once gem is released
-
 # if allow_local && File.exist?('../urbanopt-geojson-gem')
 #   gem 'urbanopt-geojson', path: '../urbanopt-geojson-gem'
 # elsif allow_local
@@ -47,7 +49,6 @@ allow_local = ENV['FAVOR_LOCAL_GEMS']
 #  gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'develop'
 # end
 
-
 #if allow_local && File.exist?('../urbanopt-rnm-us-gem')
 # gem 'urbanopt-rnm-us', path: '../urbanopt-rnm-us-gem'
 # elsif allow_local

LICENSE.md

@@ -1,6 +1,4 @@
-# License
-
-URBANopt™, Copyright (c) 2019-2023, Alliance for Sustainable Energy, LLC, and other
+URBANopt (tm), Copyright (c) 2019-2023, Alliance for Sustainable Energy, LLC, and other
 contributors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -21,19 +19,24 @@ Redistribution of this software, without modification, must refer to the softwar
 by the same designation. Redistribution of a modified version of this software
 (i) may not refer to the modified version by the same designation, or by any
 confusingly similar designation, and (ii) must refer to the underlying software
-originally provided by Alliance as “URBANopt”. Except to comply with the foregoing,
-the term “URBANopt”, or any confusingly similar designation may not be used to
+originally provided by Alliance as "URBANopt". Except to comply with the foregoing,
+the term "URBANopt", or any confusingly similar designation may not be used to
 refer to any modified version of this software or any modified version of the
 underlying software originally provided by Alliance without the prior written
 consent of Alliance.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
+The name of the copyright holder(s), any contributors, the United States Government,
+the United States Department of Energy, or any of their employees may not be used to
+endorse or promote products derived from this software without specific prior written
+permission from the respective party.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND ANY CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+THE COPYRIGHT HOLDER(S), ANY CONTRIBUTORS, THE UNITED STATES GOVERNMENT, OR THE UNITED STATES
+DEPARTMENT OF ENERGY, NOR ANY OF THEIR EMPLOYEES, BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -1,12 +1,13 @@
 [![Coverage Status](https://coveralls.io/repos/github/urbanopt/urbanopt-cli/badge.svg?branch=develop)](https://coveralls.io/github/urbanopt/urbanopt-cli?branch=develop)
+[![nightly_build](https://github.com/urbanopt/urbanopt-cli/actions/workflows/nightly_build.yml/badge.svg)](https://github.com/urbanopt/urbanopt-cli/actions/workflows/nightly_build.yml)
 
 # URBANopt CLI
 
 This is the command line interface (CLI) for the URBANopt™ SDK.
 
 ## Installation (Using Ruby)
 
-2 ) Using ruby add this line to your application's Gemfile:
+Using ruby add this line to your application's Gemfile:
 
 ```ruby
 gem 'urbanopt-cli'

Rakefile

@@ -1,41 +1,6 @@
 # *********************************************************************************
-# URBANopt™, Copyright (c) 2019-2023, Alliance for Sustainable Energy, LLC, and other
-# contributors. All rights reserved.
-
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-
-# Redistributions of source code must retain the above copyright notice, this list
-# of conditions and the following disclaimer.
-
-# Redistributions in binary form must reproduce the above copyright notice, this
-# list of conditions and the following disclaimer in the documentation and/or other
-# materials provided with the distribution.
-
-# Neither the name of the copyright holder nor the names of its contributors may be
-# used to endorse or promote products derived from this software without specific
-# prior written permission.
-
-# Redistribution of this software, without modification, must refer to the software
-# by the same designation. Redistribution of a modified version of this software
-# (i) may not refer to the modified version by the same designation, or by any
-# confusingly similar designation, and (ii) must refer to the underlying software
-# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing,
-# the term “URBANopt”, or any confusingly similar designation may not be used to
-# refer to any modified version of this software or any modified version of the
-# underlying software originally provided by Alliance without the prior written
-# consent of Alliance.
-
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-# OF THE POSSIBILITY OF SUCH DAMAGE.
+# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# See also https://github.com/urbanopt/urbanopt-cli/blob/develop/LICENSE.md
 # *********************************************************************************
 
 require 'bundler/gem_tasks'

example_files/Gemfile

@@ -35,55 +35,55 @@ if allow_local && File.exist?('../openstudio-common-measures-gem')
 elsif allow_local
   gem 'openstudio-common-measures', github: 'NREL/openstudio-common-measures-gem', branch: 'develop'
 else
-  gem 'openstudio-common-measures', '~> 0.7.0'
+  gem 'openstudio-common-measures', '~> 0.8.0'
 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'
 else
-  gem 'openstudio-model-articulation', '~> 0.7.0'
+  gem 'openstudio-model-articulation', '~> 0.8.0'
 end
 
 if allow_local && File.exist?('../openstudio-load-flexibility-measures-gem')
   gem 'openstudio-load-flexibility-measures', path: '../openstudio-load-flexibility-measures-gem'
 elsif allow_local
   gem 'openstudio-load-flexibility-measures', github: 'NREL/openstudio-load-flexibility-measures-gem', branch: 'develop'
 else
-   gem 'openstudio-load-flexibility-measures', '~> 0.6.1'
+   gem 'openstudio-load-flexibility-measures', '~> 0.7.0'
 end
 
 if allow_local && File.exist?('../openstudio-ee-gem')
   gem 'openstudio-ee', path: '../openstudio-ee-gem'
 elsif allow_local
   gem 'openstudio-ee', github: 'NREL/openstudio-ee-gem', branch: 'develop'
 else
-  gem 'openstudio-ee', '~> 0.7.0'
+  gem 'openstudio-ee', '~> 0.8.0'
 end
 
 if allow_local && File.exist?('../openstudio-calibration-gem')
   gem 'openstudio-calibration', path: '../openstudio-calibration-gem'
 elsif allow_local
   gem 'openstudio-calibration', github: 'NREL/openstudio-calibration-gem', branch: 'develop'
 else
-  gem 'openstudio-calibration', '~> 0.7.0'
+  gem 'openstudio-calibration', '~> 0.8.0'
 end
 
 if allow_local && File.exist?('../../openstudio-geb')
   gem 'openstudio-geb', path: '../../../openstudio-geb-gem'
 elsif allow_local
   gem 'openstudio-geb', github: 'LBNL-ETA/openstudio-geb-gem', branch: 'master'
 else
-  gem 'openstudio-geb', '~> 0.2.1'
+  gem 'openstudio-geb', '~> 0.3.2'
 end
 
 if allow_local && File.exists?('../urbanopt-geojson-gem')
   gem 'urbanopt-geojson', path: '../../urbanopt-geojson-gem'
 elsif allow_local
   gem 'urbanopt-geojson', github: 'URBANopt/urbanopt-geojson-gem', branch: 'develop'
 else
-  gem 'urbanopt-geojson', '~> 0.9.0'
+  gem 'urbanopt-geojson', '~> 0.10.0'
 end
 
 # NEVER put SCENARIO-GEM in this file...it will make all simulations fail due to the sqlite dependency
@@ -94,5 +94,5 @@ if allow_local && File.exist?('../urbanopt-reporting-gem')
 elsif allow_local
   gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'develop'
 else
-  gem 'urbanopt-reporting', '~> 0.7.0'
+  gem 'urbanopt-reporting', '~> 0.8.0'
 end