urbanopt-cli 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4748528e1bec16cb2fd5ceee5a33e8eb971e0413c98afc8749c25713e48b8115
-  data.tar.gz: 38ddd809cc529d9424d8fd53bb8bf577cee995c1cc2d8fe9cfa6e01893329c31
+  metadata.gz: dee18d6e4ea1f143b0616e07f3874368ec3a22c819dd218dd1e9f89301ff059e
+  data.tar.gz: e75496190b9ef64631426f7d583cc8e9d4232f10afa74b03f3dd17108b96409a
 SHA512:
-  metadata.gz: 8b2411b0c69344f0280cddd43027ed866288c0cc9f15a2535677b7e2ef94aded45067927b3a1fcc5eee094aa180c2160fd36139b5a6ceb4d6ece0d31a3c7c590
-  data.tar.gz: 779a0410116101dede994285d6b15c6639f98fd52f9e3157d6251eca847ebf63976c6d585ab05fe0c3bc467a09d14edbdde16ac81d182f3e0561882b514bf909
+  metadata.gz: d380c0760876f4a91e6a04d90cbf4d8e8c7e8fb38310eee6f539d97450410e26ccafd7d1c7fdbf723ff3a82365c8ae58967a75324a49d3545b53c9f31c7cb349
+  data.tar.gz: 7646d91864f845fb4ed641ac347e90fe1bede2a7247727abaa70bdddd553163ed1ffaa0a9b4a14ef3139ac7ed95dba478c20937ad01b73a6db3abdf33345e063

data/.github/workflows/nightly_ci_build.yml

@@ -24,8 +24,8 @@ jobs:
     strategy:
       matrix:
         # os: container operations in GHA only work on Ubuntu
-        simulation-type: [basic, GEB, residential, electric]
-        # python-version: No need to test more than 1 python-version
+        # 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.7.0
@@ -34,19 +34,13 @@ jobs:
       - 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: Set up Python
-        if: ${{ matrix.simulation-type == 'electric' }}
-        uses: actions/setup-python@v5
-        with:
-          # Disco needs python ~=3.10
-          python-version: '3.10'
       - name: Install Ruby dependencies
         run: |
           ruby --version
           bundle update
           bundle exec certified-update
       - name: Install python dependencies
-        if: ${{ matrix.simulation-type == 'electric' || matrix.simulation-type == 'basic' }}
+        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.
@@ -68,4 +62,4 @@ jobs:
           name: rspec_results
           path: |
             spec/test_directory**/
-          retention-days: 7 # save for 1 week before deleting
+          retention-days: 7 # save for 1 week then delete

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # 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
 

data/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.10.2)
 cmake_policy(SET CMP0048 NEW)
 
-project(URBANoptCLI VERSION 0.10.0)
+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-20230731-darwin.tar.gz")
-     set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "6dcaeb17c6567d5e5242c470b0ff2eb0")
+     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-20230731-linux.tar.gz")
-     set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "ff67d59a162288cb7e5d4632e970e53d")
+     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-20230801-windows.tar.gz")
-    set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "2293f9f07643d110a84afaa0c1049c03")
+    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 6)
-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 "+bb9481519e")
+  set(OPENSTUDIO_VERSION_SHA "+d5269793f1")
 
   if(APPLE)
-    set(OPENSTUDIO_EXPECTED_HASH ba881908f683ec695c209399f261b299)
+    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 5e67958249d99f96149b4d5576c3d0ef)
+      set(OPENSTUDIO_EXPECTED_HASH 5c006e5e66e5e859206a63626ea2966f)
       set(OPENSTUDIO_PLATFORM "Ubuntu-20.04-x86_64")
     else() # Assumes 20.04
-      set(OPENSTUDIO_EXPECTED_HASH 5e67958249d99f96149b4d5576c3d0ef)
+      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 802f8cffeac24f011e636baf1e6ffd40)
+    set(OPENSTUDIO_EXPECTED_HASH f192860357fdbffb5705942a991b072b)
     set(OPENSTUDIO_PLATFORM "Windows")
     set(OPENSTUDIO_EXT "tar.gz")
   endif()

data/lib/uo_cli/version.rb

@@ -5,6 +5,6 @@
 
 module URBANopt
   module CLI
-    VERSION = '0.11.0'.freeze
+    VERSION = '0.11.1'.freeze
   end
 end

data/lib/uo_cli.rb

@@ -376,6 +376,9 @@ module URBANopt
             "Valid choices: 'time_series'", type: String, default: 'time_series'
 
           opt :ghe, "\nUse this argument to add Ground Heat Exchanger properties to the System Parameter File.\n", short: :g
+
+          opt :overwrite, "\n Delete and rebuild existing sys-param file\n", short: :o
+          'Example: uo des_params --sys-param-file path/to/sys_params.json --feature path/to/example_project.json --overwrite'
         end
       end
 
@@ -390,11 +393,10 @@ module URBANopt
             'Example: uo des_create --feature path/to/example_project.json', type: String, required: true, short: :f
 
           opt :des_name, "\nPath to Modelica project dir to be created\n" \
-            'Example: uo des_create --des-name path/to/example_modelica_project', type: String, required: true
-
-          opt :model_type, "\nSelection for which kind of DES simulation to perform\n" \
-            "Valid choices: 'time_series'", type: String, default: 'time_series'
+            'Example: uo des_create --des-name path/to/example_modelica_project', type: String, required: true, short: :n
 
+          opt :overwrite, "\nDelete and rebuild existing model directory\n", short: :o
+            'Example: uo des_create --des-name path/to/example_modelica_project --overwrite'
         end
       end
 
@@ -1758,6 +1760,10 @@ module URBANopt
           end
           des_cli_addition += " --ghe"
         end
+        if @opthash.subopts[:overwrite]
+          puts "\nDeleting and rebuilding existing sys-param file"
+          des_cli_addition += " --overwrite"
+        end
       else
         abort("\nCommand must include new system parameter file name, ScenarioFile, & FeatureFile. Please try again")
       end
@@ -1786,8 +1792,9 @@ module URBANopt
         if @opthash.subopts[:des_name]
           des_cli_addition += " #{File.expand_path(@opthash.subopts[:des_name])}"
         end
-        if @opthash.subopts[:model_type]
-          des_cli_addition += " #{@opthash.subopts[:model_type]}"
+        if @opthash.subopts[:overwrite]
+          puts "\nDeleting and rebuilding existing Modelica dir"
+          des_cli_addition += " --overwrite"
         end
       else
         abort("\nCommand must include system parameter file name, FeatureFile, and model name. Please try again")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: urbanopt-cli
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - NREL URBANopt team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-26 00:00:00.000000000 Z
+date: 2024-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: optimist