Merge branch 'develop' into ghp_lcca

.github/workflows/nightly_ci_build.yml

@@ -3,13 +3,11 @@ name: CLI CI
 on:
   workflow_dispatch:
   # Run on demand and weeknights
-  # push:
+  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'
-  pull_request:
-    types: [review_requested]
 
 env:
   # Favor_Local_Gems enforces develop branch of all Ruby dependencies
@@ -24,6 +22,7 @@ env:
 jobs:
   weeknight-tests:
     strategy:
+      fail-fast: false
       matrix:
         # os: container operations in GHA only work on Ubuntu
         # https://docs.github.com/en/actions/using-containerized-services/about-service-containers

CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## Version 0.14.0
+Date Range: 06/27/2024 - 11/15/2024
+
+## What's Changed
+### Exciting New Features 🎉
+* Upgrade version of ThermalNetwork Python dependency by @vtnate in https://github.com/urbanopt/urbanopt-cli/pull/493
+* Upgrade miniconda by @vtnate in https://github.com/urbanopt/urbanopt-cli/pull/492
+* Use new version of GMT by @vtnate in https://github.com/urbanopt/urbanopt-cli/pull/489
+### Other Changes
+* Update installer patch by @tijcolem in https://github.com/urbanopt/urbanopt-cli/pull/476
+* Fix installer path bug by @vtnate in https://github.com/urbanopt/urbanopt-cli/pull/485
+* Remove unnecessary default user-entry for DES commands by @vtnate in https://github.com/urbanopt/urbanopt-cli/pull/486
+
+
+**Full Changelog**: https://github.com/urbanopt/urbanopt-cli/compare/v0.13.0...v0.14.0
+
 ## Version 0.13.0
 Date Range: 05/15/2024 - 06/27/2024
 

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.10.2)
 cmake_policy(SET CMP0048 NEW)
 
-project(URBANoptCLI VERSION 0.12.0)
+project(URBANoptCLI VERSION 0.14.0)
 
 include(FindOpenStudioSDK.cmake)
 
@@ -89,21 +89,21 @@ 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-20240521-darwin.tar.gz")
-     set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "b68de4be53118f58e245aa8bd17f8992")
+     set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20241118-darwin.tar.gz")
+     set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "8c4d1ff5b4eb0592c16b4b2d259db6cd")
    else()
      if (ARCH MATCHES "arm64")
-       set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20240524-linux-arm.tar.gz")
-       set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "18915b55621ee755bf92c506b5cdba2a")
+       set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-2024112-linux-arm.tar.gz")
+       set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "67f329867b472d3fc84c304f306398e0")
      else() 
-       set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20240521-linux.tar.gz")
-       set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "3f5bf6bc692b0bcc5f50a5b45c2698b3")
+       set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20241118-linux.tar.gz")
+       set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "8e0203189e6b5abe857f714720d2b098")
      endif()	
    endif()
 elseif(WIN32)
   if(CMAKE_CL_64)
-    set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20240521-windows.tar.gz")
-    set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "c01415b7b91a0db7ad97ad0493286598")
+    set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20241119-windows.tar.gz")
+    set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "6e0e369409108e7ad24e25a32d73d3b8")
   endif()
 endif()
 
@@ -182,7 +182,6 @@ if(UNIX)
 elseif(WIN32)
   install(PROGRAMS ${PROJECT_SOURCE_DIR}/scripts/setup-env-gitbash.sh DESTINATION "." COMPONENT "URBANopt" RENAME "setup-env.sh")
   install(PROGRAMS ${PROJECT_SOURCE_DIR}/scripts/setup-env.ps1 DESTINATION "." COMPONENT "URBANopt")
-  install(PROGRAMS ${PROJECT_SOURCE_DIR}/scripts/setup-env.bat DESTINATION "." COMPONENT "URBANopt")
 endif()
 
 install(DIRECTORY "${PROJECT_BINARY_DIR}/ruby" DESTINATION "." COMPONENT "Ruby" USE_SOURCE_PERMISSIONS)

FindOpenStudioSDK.cmake

@@ -35,6 +35,7 @@ else()
     else() # Assumes 20.04
       set(OPENSTUDIO_EXPECTED_HASH 5c006e5e66e5e859206a63626ea2966f)
       set(OPENSTUDIO_PLATFORM "Ubuntu-20.04-x86_64")
+    endif()
     if(LSB_RELEASE_VERSION_SHORT MATCHES "20.04")
       if (ARCH MATCHES "arm64")
         set(OPENSTUDIO_EXPECTED_HASH d98b3d3d133a7c5bc1b9581553d23811)

README.md

@@ -55,12 +55,12 @@ sudo apt install ./UrbanOptCLI-0.3.1.b6f118d506-Linux.deb
 
 This will install to `/usr/local/` directory.
 e.g.
-`/usr/local/urbanopt-cli-0.3.1/`
+`/usr/local/urbanopt-cli-0.13.0/`
 
 To run the UrbanOpt CLI, first run the `setup-env.sh` script that generates environmental variables and stores these in `env_uo.sh` in your home directory.
 
 ```terminal
-/usr/local/urbanopt-cli-0.3.1/setup-env.sh
+/usr/local/urbanopt-cli-0.13.0/setup-env.sh
 . ~/.env_uo.sh
 ```
 
@@ -74,7 +74,7 @@ Use the GUI installer and choose a directory to install. Once installed, open a
 The `setup-env.sh` generates env variables and stores them in a file `.env_uo.sh` in your home directory.
 
 ```terminal
-/Applications/UrbanOptCLI_0.3.1/setup-env.sh
+/Applications/UrbanOptCLI_0.13.0/setup-env.sh
 . ~/.env_uo.sh
 ```
 
@@ -89,19 +89,19 @@ Use the GUI installer and choose a directory to install. Once installed, open a
 
 #### Bash (or GitBash for Windows)
 ```terminal
-c:/urbanopt-cli-0.3.1/setup-env.sh
+c:/urbanopt-cli-0.13.0/setup-env.sh
 . ~/.env_uo.sh
 ```
 
-#### Powershell
+#### Powershell or Command Prompt
 ```terminal
-c:\urbanopt-cli-0.3.1\setup-env.ps1
+c:\urbanopt-cli-0.13.0\setup-env.ps1
 . ~\.env_uo.ps1
 ```
 #### Windows Command Prompt
+After the `setup-env.ps1` script has been run:
 ```terminal
-c:\urbanopt-cli-0.3.1\setup-env.bat
-%HOMEPATH%\.env_uo.bat
+"%HOMEPATH%/.env_uo.bat"
 ```
 
 When launching new shell terminals run the correct environment config to setup the environment. 
@@ -188,10 +188,10 @@ Python dependencies are currently versioned as follows:
 
 | Python Package              | Version |
 | --------------------------- | ------- |
-| urbanopt-ditto-reader       | 0.6.3   |
-| NREL-disco                  | 0.5.0   |
-| geojson-modelica-translator | 0.6.0   |
-| ThermalNetwork              | 0.2.3   |
+| urbanopt-ditto-reader       | 0.6.4   |
+| NREL-disco                  | 0.5.1   |
+| geojson-modelica-translator | 0.8.0   |
+| ThermalNetwork              | 0.3.0   |
 
 ## Development
 

example_files/python_deps/dependencies.json

@@ -1,5 +1,5 @@
 [
-  { "name": "ThermalNetwork", "version": "0.2.5"},
+  { "name": "ThermalNetwork", "version": "0.3.0"},
   { "name": "urbanopt-ditto-reader", "version": "0.6.4"},
   { "name": "NREL-disco", "version": "0.5.1"},
   { "name": "geojson-modelica-translator", "version": "0.8.0"}

example_files/python_deps/install_python.sh

@@ -77,13 +77,29 @@ if [ ! -d $INSTALL_BASE ]; then
 	exit 1
 fi
 
-if [[ "$OSTYPE" == "linux-gnu" ]]; then
-	PLATFORM=Linux-x86_64
-elif [[ "$OSTYPE" == "darwin"* ]]; then
-	PLATFORM=MacOSX-x86_64
-else
-	error "unknown OS type $OSTYPE"
-	exit 1
+architecture=$(uname -m)
+
+echo "$architecture"
+
+# Handle multiple chip architectures (ARM & x86) as well as OS types (Linux & MacOS)
+if [[ $architecture == "x86"* || $architecture == "i686" || $architecture == "i386" ]]; then
+	if [[ "$OSTYPE" == "linux-gnu" ]]; then
+		PLATFORM=Linux-x86_64
+	elif [[ "$OSTYPE" == "darwin"* ]]; then
+		PLATFORM=MacOSX-x86_64
+	else
+		error "unknown OS type $OSTYPE"
+		exit 1
+	fi
+elif [[ $architecture == "arm"* || $architecture == "aarch"* ]]; then
+	if [[ "$OSTYPE" == "linux-gnu" ]]; then
+		PLATFORM=Linux-aarch64
+	elif [[ "$OSTYPE" == "darwin"* ]]; then
+		PLATFORM=MacOSX-arm64
+	else
+		error "unknown OS type $OSTYPE"
+		exit 1
+	fi
 fi
 
 CONDA_PACKAGE_NAME=Miniconda3-py${PYTHON_MAJOR_MINOR}_${CONDA_VERSION}-${PLATFORM}.sh