urbanopt-cli 0.10.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5d19eaf9c22b0fe9beba1b6e0f670e1a567dc42fc0be83e93135d049364b96b
-  data.tar.gz: 9daf693c1dff1a4dbcaca280ffcc2185710f2d8159c5a8805012f5c5617c3453
+  metadata.gz: dee18d6e4ea1f143b0616e07f3874368ec3a22c819dd218dd1e9f89301ff059e
+  data.tar.gz: e75496190b9ef64631426f7d583cc8e9d4232f10afa74b03f3dd17108b96409a
 SHA512:
-  metadata.gz: 7acffa0338a83878f612be662930dc946e7edf44f0582b979fdfd57357caba7cc61d48563044980bdbb6fa26809c61383fef81ca2f85d4fa904ccdb2e580d648
-  data.tar.gz: bc065bd971724f6a128070e68df145ed62311b6b4dce809be31a01c3e7a509f3b21124ac0fcd2645bd5b500a172e02270404ba59cf0afaac1152e7c475784cb2
+  metadata.gz: d380c0760876f4a91e6a04d90cbf4d8e8c7e8fb38310eee6f539d97450410e26ccafd7d1c7fdbf723ff3a82365c8ae58967a75324a49d3545b53c9f31c7cb349
+  data.tar.gz: 7646d91864f845fb4ed641ac347e90fe1bede2a7247727abaa70bdddd553163ed1ffaa0a9b4a14ef3139ac7ed95dba478c20937ad01b73a6db3abdf33345e063

data/.github/release.yml

@@ -0,0 +1,24 @@
+# https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes#configuration-options
+
+changelog:
+  exclude:
+    labels:
+      - ignore-for-release
+      - DO NOT MERGE
+      - invalid
+      - dependencies
+      - tests
+    authors:
+      - octocat
+      - dependabot
+  categories:
+    - title: Breaking Changes 🛠
+      labels:
+        - breaking-change
+    - title: Exciting New Features 🎉
+      labels:
+        - enhancement
+        - Feature
+    - title: Other Changes
+      labels:
+        - "*"

data/.github/workflows/nightly_ci_build.yml

@@ -1,11 +1,14 @@
-name: nightly_build
+name: CLI CI
 
 on:
+  # Run on weeknights, and also whenever a push is made
   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'
+  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'
+  # pull_request:
+    # types: [review_requested]
 
 env:
   # Favor_Local_Gems enforces develop branch of all Ruby dependencies
@@ -13,49 +16,50 @@ env:
   # If CI is then successful, we have a breaking change in a dependency somewhere.
   FAVOR_LOCAL_GEMS: true
   GEM_DEVELOPER_KEY: ${{ secrets.GEM_DEVELOPER_KEY }}
-  UO_NUM_PARALLEL: 2
-  # GHA machines only have 2 cores. Trying to run more than that is even slower.
-  # https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources
-
+  UO_NUM_PARALLEL: 4
+  # GHA machines have 4 cores. Trying to run more concurrently will slow everything down.
+  # https://github.blog/2024-01-17-github-hosted-runners-double-the-power-for-open-source/
 jobs:
   weeknight-tests:
-    # ubuntu-latest works since https://github.com/rbenv/ruby-build/releases/tag/v20220710 (July 10, 2022)
-    # https://github.com/rbenv/ruby-build/discussions/1940
+    strategy:
+      matrix:
+        # os: container operations in GHA only work on Ubuntu
+        # https://docs.github.com/en/actions/using-containerized-services/about-service-containers
+        simulation-type: [basic, GHE, GEB, residential, electric]
     runs-on: ubuntu-latest
     container:
-      image: docker://nrel/openstudio:3.6.1
+      image: docker://nrel/openstudio:3.7.0
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          # Disco needs python 3.10
-          python-version: '3.10'
+      - uses: actions/checkout@v4
+      - name: Change Owner of Container Working Directory
+      # working dir permissions workaround from https://github.com/actions/runner-images/issues/6775#issuecomment-1377299658
+        run: chown root:root .
       - name: Install Ruby dependencies
         run: |
           ruby --version
           bundle update
           bundle exec certified-update
       - name: Install python dependencies
-        run: bundle exec uo install_python
-      - name: Run Rspec
-        continue-on-error: true
-        # Continue to upload step even if a test fails, so we can troubleshoot
-        run: bundle exec rspec
+        if: ${{ matrix.simulation-type == 'electric' || matrix.simulation-type == 'GHE' }}
+        run: bundle exec rspec -e 'Install python dependencies'
+      - name: Test project setup
+        # We only need to run these tests once, not every matrix iteration.
+        if: ${{ matrix.simulation-type == 'basic' }}
+        run: |
+          bundle exec rspec -e 'Admin'
+          bundle exec rspec -e 'Create project'
+          bundle exec rspec -e 'Make and manipulate ScenarioFiles'
+          bundle exec rspec -e 'Update project directory'
+      - name: Test simulations
+        run: bundle exec rspec -e 'Run and work with a small ${{ matrix.simulation-type }} simulation'
       - name: Upload artifacts
       # Save results for examination - useful for debugging
         uses: actions/upload-artifact@v3
-        # Only upload if rspec fails
+        # Using v4 would mean we have to change our path design, and/or the test dir names
+        # Only upload if a previous step fails
         if: failure()
         with:
           name: rspec_results
           path: |
-            spec/test_directory**/run/
-            # coverage/
-          retention-days: 7 # save for 1 week before deleting
-      # coveralls action docs: https://github.com/marketplace/actions/coveralls-github-action
-      # - name: Coveralls
-      #   uses: coverallsapp/github-action@1.1.3
-      #   with:
-      #     github-token: ${{ secrets.GITHUB_TOKEN }}
-      #     path-to-lcov: "./coverage/lcov/urbanopt-cli.lcov"
+            spec/test_directory**/
+          retention-days: 7 # save for 1 week then delete

data/.gitignore

@@ -29,3 +29,4 @@ Gemfile.lock
 example_files/python_deps/Miniconda*
 example_files/python_deps/python_config.json
 example_files/python_deps/python
+example_files/python_deps/python-3.10

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## Version 0.11.1
+Date Range: 01/26/2024 - 02/08/2024
+
+* Call GMT-cli correctly by @vtnate in https://github.com/urbanopt/urbanopt-cli/pull/449
+
+
+**Full Changelog**: https://github.com/urbanopt/urbanopt-cli/compare/v0.11.0...v0.11.1
+
+## Version 0.11.0
+Date Range: 07/20/23 - 01/26/24
+
+### Exciting New Features 🎉
+* error handling for non-US weatherfiles by @vtnate in https://github.com/urbanopt/urbanopt-cli/pull/443
+* Ground Heat Exchanger Workflow by @tanushree04 in https://github.com/urbanopt/urbanopt-cli/pull/426
+* Initial implementation of geometry orientation and aspect ratio by @rawadelkontar in https://github.com/urbanopt/urbanopt-cli/pull/444
+### Other Changes
+* Update installer 0.10.0 by @tijcolem in https://github.com/urbanopt/urbanopt-cli/pull/433
+* Remove jenkins by @vtnate in https://github.com/urbanopt/urbanopt-cli/pull/432
+* Coverage badges by @vtnate in https://github.com/urbanopt/urbanopt-cli/pull/434
+* Update README.md by @vtnate in https://github.com/urbanopt/urbanopt-cli/pull/435
+* Categorize tests to parallelize CI by @vtnate in https://github.com/urbanopt/urbanopt-cli/pull/442
+* use unsecured http as default rubygems source in project_dir by @vtnate in https://github.com/urbanopt/urbanopt-cli/pull/445
+
+**Full Changelog**: https://github.com/urbanopt/urbanopt-cli/compare/v0.10.0...v0.11.0
+
 ## Version 0.10.0
 Date Range: 06/14/22 - 7/20/23
 

data/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.10.2)
 cmake_policy(SET CMP0048 NEW)
 
-project(URBANoptCLI VERSION 0.9.3)
+project(URBANoptCLI VERSION 0.11.0)
 
 include(FindOpenStudioSDK.cmake)
 
@@ -89,16 +89,16 @@ option(BUILD_PACKAGE "Build package" OFF)
 # need to  update the MD5sum for each platform and url below
 if(UNIX)
    if(APPLE)
-     set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20230616-darwin.tar.gz")
-     set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "0e1a97892eec849f469afd1a8f115321")
+     set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20240202-darwin.tar.gz")
+     set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "27dad609451f5b0e7835efbcb8e362b7")
    else()
-     set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20230616-linux.tar.gz")
-     set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "8d0ca0d83c184a4b4a9c389ca79ffe8b")
+     set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20240202-linux.tar.gz")
+     set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "2182c1ca7bcd85505db4700f4937d181")
    endif()
 elseif(WIN32)
   if(CMAKE_CL_64)
-    set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20230616-windows.tar.gz")
-    set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "97ec22034dd6585a6356c01ba7a66c29")
+    set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20240202-windows.tar.gz")
+    set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "7a7cc4f928646363bd57b41e10caebca")
   endif()
 endif()
 

data/FindOpenStudioSDK.cmake

@@ -1,6 +1,6 @@
 set(OPENSTUDIO_VERSION_MAJOR 3)
-set(OPENSTUDIO_VERSION_MINOR 5)
-set(OPENSTUDIO_VERSION_PATCH 1)
+set(OPENSTUDIO_VERSION_MINOR 7)
+set(OPENSTUDIO_VERSION_PATCH 0)
 set(OPENSTUDIO_VERSION "${OPENSTUDIO_VERSION_MAJOR}.${OPENSTUDIO_VERSION_MINOR}.${OPENSTUDIO_VERSION_PATCH}")
 
 find_package(openstudio "${OPENSTUDIO_VERSION}" CONFIG)
@@ -13,26 +13,26 @@ else()
 #  find_package(openstudio "${OPENSTUDIO_VERSION}" CONFIG REQUIRED)
 
 
-  set(OPENSTUDIO_BASELINK "https://openstudio-builds.s3.amazonaws.com/${OPENSTUDIO_VERSION}"
+  set(OPENSTUDIO_BASELINK "https://github.com/NREL/OpenStudio/releases/download/v${OPENSTUDIO_VERSION}"
     CACHE STRING "Base link to where the openstudio archives are hosted" FORCE)
 
-  set(OPENSTUDIO_VERSION_SHA "+22e1db7be5")
+  set(OPENSTUDIO_VERSION_SHA "+d5269793f1")
 
   if(APPLE)
-    set(OPENSTUDIO_EXPECTED_HASH f21b03a44aa9ac3e52a4bdfa20009171)
+    set(OPENSTUDIO_EXPECTED_HASH a4585ef0a3523168f8975ecd1cff1d12)
     set(OPENSTUDIO_PLATFORM "Darwin-x86_64")
     set(OPENSTUDIO_EXT "tar.gz")
   elseif(UNIX)
     if(LSB_RELEASE_VERSION_SHORT MATCHES "20.04")
-      set(OPENSTUDIO_EXPECTED_HASH 6e5c93002f0cfb445dcdcdb1270261a4)
-      set(OPENSTUDIO_PLATFORM "Ubuntu-20.04")
+      set(OPENSTUDIO_EXPECTED_HASH 5c006e5e66e5e859206a63626ea2966f)
+      set(OPENSTUDIO_PLATFORM "Ubuntu-20.04-x86_64")
     else() # Assumes 20.04
-      set(OPENSTUDIO_EXPECTED_HASH 6e5c93002f0cfb445dcdcdb1270261a4)
-      set(OPENSTUDIO_PLATFORM "Ubuntu-20.04")
+      set(OPENSTUDIO_EXPECTED_HASH 5c006e5e66e5e859206a63626ea2966f)
+      set(OPENSTUDIO_PLATFORM "Ubuntu-20.04-x86_64")
     endif()
     set(OPENSTUDIO_EXT "tar.gz")
   elseif(WIN32)
-    set(OPENSTUDIO_EXPECTED_HASH bc83efcb140d20f8f9758559a58c4347)
+    set(OPENSTUDIO_EXPECTED_HASH f192860357fdbffb5705942a991b072b)
     set(OPENSTUDIO_PLATFORM "Windows")
     set(OPENSTUDIO_EXT "tar.gz")
   endif()

data/LICENSE.md

@@ -1,42 +1,15 @@
-URBANopt (tm), Copyright (c) 2019-2023, Alliance for Sustainable Energy, LLC, and other
-contributors. All rights reserved.
+URBANopt (tm), Copyright (c) 2019-2024, 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:
+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 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.
+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.
+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.
+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.
 
-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.
+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.
+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.

data/README.md

@@ -1,5 +1,18 @@
-[![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)
+[![CLI build status](https://github.com/urbanopt/urbanopt-cli/actions/workflows/nightly_ci_build.yml/badge.svg)](https://github.com/urbanopt/urbanopt-cli/actions/workflows/nightly_ci_build.yml)<br/>
+[![Core-gem](https://github.com/urbanopt/urbanopt-core-gem/actions/workflows/nightly_build.yml/badge.svg)](https://github.com/urbanopt/urbanopt-core-gem/actions/workflows/nightly_build.yml)
+[![Coverage Status](https://coveralls.io/repos/github/urbanopt/urbanopt-core-gem/badge.svg?branch=develop)](https://coveralls.io/github/urbanopt/urbanopt-core-gem?branch=develop)<br/>
+[![Geojson-gem](https://github.com/urbanopt/urbanopt-geojson-gem/actions/workflows/nightly_build.yml/badge.svg)](https://github.com/urbanopt/urbanopt-geojson-gem/actions/workflows/nightly_build.yml)
+[![Coverage Status](https://coveralls.io/repos/github/urbanopt/urbanopt-geojson-gem/badge.svg?branch=develop)](https://coveralls.io/github/urbanopt/urbanopt-geojson-gem?branch=develop)<br/>
+[![Reopt-gem](https://github.com/urbanopt/urbanopt-reopt-gem/actions/workflows/nightly_ci_build.yml/badge.svg)](https://github.com/urbanopt/urbanopt-reopt-gem/actions/workflows/nightly_ci_build.yml)
+[![Coverage Status](https://coveralls.io/repos/github/urbanopt/urbanopt-reopt-gem/badge.svg?branch=develop)](https://coveralls.io/github/urbanopt/urbanopt-reopt-gem?branch=develop)<br/>
+[![Reporting-gem](https://github.com/urbanopt/urbanopt-reporting-gem/actions/workflows/nightly_ci_build.yml/badge.svg)](https://github.com/urbanopt/urbanopt-reporting-gem/actions/workflows/nightly_ci_build.yml)
+[![Coverage Status](https://coveralls.io/repos/github/urbanopt/urbanopt-reporting-gem/badge.svg?branch=develop)](https://coveralls.io/github/urbanopt/urbanopt-reporting-gem?branch=develop)<br/>
+[![RNM-gem](https://github.com/urbanopt/urbanopt-rnm-us-gem/actions/workflows/nightly_ci_build.yml/badge.svg)](https://github.com/urbanopt/urbanopt-rnm-us-gem/actions/workflows/nightly_ci_build.yml)
+[![Coverage Status](https://coveralls.io/repos/github/urbanopt/urbanopt-rnm-us-gem/badge.svg?branch=develop)](https://coveralls.io/github/urbanopt/urbanopt-rnm-us-gem?branch=develop)<br/>
+[![Scenario-gem](https://github.com/urbanopt/urbanopt-scenario-gem/actions/workflows/nightly_ci_build.yml/badge.svg)](https://github.com/urbanopt/urbanopt-scenario-gem/actions/workflows/nightly_ci_build.yml)
+[![Coverage Status](https://coveralls.io/repos/github/urbanopt/urbanopt-scenario-gem/badge.svg?branch=develop)](https://coveralls.io/github/urbanopt/urbanopt-scenario-gem?branch=develop)<br/>
+[![Example-project CI](https://github.com/urbanopt/urbanopt-example-geojson-project/actions/workflows/weekly_build.yml/badge.svg)](https://github.com/urbanopt/urbanopt-example-geojson-project/actions/workflows/weekly_build.yml)
+[![Coverage Status](https://coveralls.io/repos/github/urbanopt/urbanopt-example-geojson-project/badge.svg?branch=develop)](https://coveralls.io/github/urbanopt/urbanopt-example-geojson-project?branch=develop)
 
 # URBANopt CLI
 
@@ -7,7 +20,7 @@ This is the command line interface (CLI) for the URBANopt™ SDK.
 
 ## Installation (Using Ruby)
 
-Using ruby add this line to your application's Gemfile:
+Add this line to your application's Gemfile:
 
 ```ruby
 gem 'urbanopt-cli'
@@ -28,7 +41,7 @@ gem install urbanopt-cli
 
 ## Installation (Using Installer)
 
-The UrbanOpt installer is an alternate way to install the UrbanOpt CLI that also includes Ruby 2.5.x and OpenStudio SDK.
+The UrbanOpt installer is an alternate way to install the UrbanOpt CLI that also includes Ruby 2.7.2 and the OpenStudio SDK.
 Below are installation instructions for each platform.
 
 ### Linux (Ubuntu 18.04)
@@ -65,7 +78,7 @@ The `setup-env.sh` generates env variables and stores them in a file `.env_uo.sh
 . ~/.env_uo.sh
 ```
 
-When launching new shell terminals run `. ~/.env_uo.s` to setup the environment. 
+When launching new shell terminals run `. ~/.env_uo.sh` to setup the environment. 
 
 ### Windows (64-bit Windows 7 – 10)
 
@@ -155,7 +168,7 @@ Post-process simulations for a full scenario:
 uo process --<TYPE> --scenario <SCENARIOFILE> --feature <FEATUREFILE>
 ```
 
-- Valid `TYPE`s are: `default`, `opendss`, `reopt-scenario`, `reopt-feature`
+- Valid `TYPE`s are: `default`, `opendss`, `reopt-scenario`, `reopt-feature`, `reopt-resilience`, `disco`
 
 Delete a scenario you have already run:
 
@@ -173,10 +186,12 @@ uo --version
 
 Python dependencies are currently versioned as follows:
 
-| Python Package  | Version |
-| ----------- | ----------- |
-| urbanopt-ditto-reader      | 0.4.0       |
-| NREL-disco   |  0.3.4 from https://github.com/NREL/disco.git |
+| Python Package              | Version |
+| --------------------------- | ------- |
+| urbanopt-ditto-reader       | 0.6.3   |
+| NREL-disco                  | 0.5.0   |
+| geojson-modelica-translator | 0.6.0   |
+| ThermalNetwork              | 0.2.3   |
 
 ## Development
 

data/example_files/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source 'http://rubygems.org'
 
 ruby '~> 2.7.0'
 
@@ -35,7 +35,7 @@ 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.8.0'
+  gem 'openstudio-common-measures', '~> 0.9.0'
 end
 
 if allow_local && File.exist?('../openstudio-model-articulation-gem')
@@ -43,7 +43,7 @@ if allow_local && File.exist?('../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.8.0'
+  gem 'openstudio-model-articulation', '~> 0.9.0'
 end
 
 if allow_local && File.exist?('../openstudio-load-flexibility-measures-gem')
@@ -51,7 +51,7 @@ if allow_local && File.exist?('../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.7.0'
+   gem 'openstudio-load-flexibility-measures', '~> 0.8.0'
 end
 
 if allow_local && File.exist?('../openstudio-ee-gem')
@@ -59,7 +59,7 @@ if allow_local && File.exist?('../openstudio-ee-gem')
 elsif allow_local
   gem 'openstudio-ee', github: 'NREL/openstudio-ee-gem', branch: 'develop'
 else
-  gem 'openstudio-ee', '~> 0.8.0'
+  gem 'openstudio-ee', '~> 0.9.0'
 end
 
 if allow_local && File.exist?('../openstudio-calibration-gem')
@@ -67,7 +67,7 @@ if allow_local && File.exist?('../openstudio-calibration-gem')
 elsif allow_local
   gem 'openstudio-calibration', github: 'NREL/openstudio-calibration-gem', branch: 'develop'
 else
-  gem 'openstudio-calibration', '~> 0.8.0'
+  gem 'openstudio-calibration', '~> 0.9.0'
 end
 
 if allow_local && File.exist?('../../openstudio-geb')
@@ -75,7 +75,7 @@ if allow_local && File.exist?('../../openstudio-geb')
 elsif allow_local
   gem 'openstudio-geb', github: 'LBNL-ETA/openstudio-geb-gem', branch: 'master'
 else
-  gem 'openstudio-geb', '~> 0.3.2'
+  gem 'openstudio-geb', '~> 0.4.0'
 end
 
 if allow_local && File.exists?('../urbanopt-geojson-gem')
@@ -83,7 +83,7 @@ if allow_local && File.exists?('../urbanopt-geojson-gem')
 elsif allow_local
   gem 'urbanopt-geojson', github: 'URBANopt/urbanopt-geojson-gem', branch: 'develop'
 else
-  gem 'urbanopt-geojson', '~> 0.10.0'
+  gem 'urbanopt-geojson', '~> 0.11.1'
 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.8.0'
+  gem 'urbanopt-reporting', '~> 0.9.1'
 end

data/example_files/example_project_combined.json

@@ -650,7 +650,10 @@
         "system_type": "Residential - furnace and central air conditioner",
         "heating_system_fuel_type": "natural gas",
         "onsite_parking_fraction": 1,
-        "template": "Residential IECC 2015 - Customizable Template Sep 2020"
+        "template": "Residential IECC 2015 - Customizable Template Sep 2020",
+        "geometry_unit_orientation": 90.0,
+        "geometry_unit_aspect_ratio" : 1.0
+
       },
       "geometry": {
         "type": "Polygon",
@@ -793,6 +796,7 @@
         "number_of_stories": 2,
         "number_of_stories_above_ground": 2,
         "foundation_type": "slab",
+        "number_of_residential_units": 4,
         "hpxml_directory": "17"
       },
       "geometry": {
@@ -879,4 +883,4 @@
       "name": "New Scenario"
     }
   ]
-}
+}