Merge branch 'develop'

.github/ISSUE_TEMPLATE/bug_report.md

@@ -9,11 +9,11 @@ assignees: ''
 
 ### Expected behavior
 
-_A clear and concise description of what you expected to happen._
+<!--A clear and concise description of what you expected to happen.-->
 
 ### Actual behavior
 
-_A clear and concise description of what actually happens._
+<!--A clear and concise description of what actually happens.-->
 
 ### To Reproduce
 
@@ -23,6 +23,12 @@ Steps to reproduce the behavior:
 1. Enter '...'
 1. Enter '...'
 
+### Version
+<!--Please fill in your version of URBANopt to help us diagnose the issue.-->
+<!--If you are not on the [newest version](https://docs.urbanopt.net/developer_resources/compatibility_matrix.html), please update.-->
+<!--Review the [release notes](https://docs.urbanopt.net/developer_resources/known_issues.html) for help with known issues.-->
+URBANopt: `X.Y.Z`
+
 ### Additional context
 
-_E.g.: Windows, Mac, Linux? Are you behind a firewall? Do you have additional security constraints?_
+<!--Are you behind a firewall? Do you have additional security constraints?-->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -7,14 +7,14 @@ assignees: ''
 
 ---
 
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+### Is your feature request related to a problem? Please describe
+<!--A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]-->
 
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
+### The solution you'd like
+<!--A clear and concise description of what you want to happen.-->
 
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
+### Alternatives you've considered
+<!--A clear and concise description of any alternative solutions or features you've considered.-->
 
-**Additional context**
-Add any other context or screenshots about the feature request here.
+### Additional context
+<!--Add any other context or screenshots about the feature request here.-->

.github/pull_request_template.md

@@ -8,5 +8,5 @@
 
 - [ ] Unit tests have been added or updated
 - [ ] All ci tests pass (green)
-- [ ] An [issue](https://github.com/urbanopt/urbanopt-cli/issues) has been created (which will be used for the changelog)
+- [ ] This PR has been labeled appropriately (which will be used for the changelog)
 - [ ] This branch is up-to-date with develop

.github/workflows/nightly_ci_build.yml

@@ -13,7 +13,7 @@ env:
   # Favor_Local_Gems enforces develop branch of all Ruby dependencies
   # This is our canary in the coal mine! If any simulation tests fail, comment this and retry.
   # If CI is then successful, we have a breaking change in a dependency somewhere.
-  # FAVOR_LOCAL_GEMS: true
+  FAVOR_LOCAL_GEMS: true
   GEM_DEVELOPER_KEY: ${{ secrets.GEM_DEVELOPER_KEY }}
   UO_NUM_PARALLEL: 4
   # GHA machines have 4 cores. Trying to run more concurrently will slow everything down.
@@ -56,11 +56,10 @@ jobs:
         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
-        # Using v4 would mean we have to change our path design, and/or the test dir names
+        uses: actions/upload-artifact@v4
         # Only upload if a previous step fails
         if: failure()
         with:
-          name: rspec_results
+          name: rspec_results_${{ matrix.simulation-type }}
           path: artifact.zip
           retention-days: 7 # save for 1 week then delete

CHANGELOG.md

@@ -1,19 +1,36 @@
 # Changelog
 
+## Version 1.0.1
+
+## What's Changed
+
+* Update reopt assumptions file to work with REopt-api v3.11 by @vtnate in https://github.com/urbanopt/urbanopt-cli/pull/504
+
+**Full Changelog**: https://github.com/urbanopt/urbanopt-cli/compare/v1.0.0...v1.0.1
+
+## Version 1.0.0
+
+* Update to support ruby 3.2.2 and OpenStudio 3.9.0
+
+**Full Changelog**: https://github.com/urbanopt/urbanopt-cli/compare/v0.14.0...v1.0.0
+
 ## 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

Gemfile

@@ -24,7 +24,7 @@ allow_local = ENV['FAVOR_LOCAL_GEMS']
 # gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'master'
 
 if allow_local && File.exist?('../urbanopt-scenario-gem')
- gem 'urbanopt-scenario', path: '../urbanopt-scenario-gem'
+  gem 'urbanopt-scenario', path: '../urbanopt-scenario-gem'
 elsif allow_local
   gem 'urbanopt-scenario', github: 'URBANopt/urbanopt-scenario-gem', branch: 'develop'
 end
@@ -36,7 +36,7 @@ elsif allow_local
 end
 
 if allow_local && File.exist?('../urbanopt-reopt-gem')
- gem 'urbanopt-reopt', path: '../urbanopt-reopt-gem'
+  gem 'urbanopt-reopt', path: '../urbanopt-reopt-gem'
 elsif allow_local
   gem 'urbanopt-reopt', github: 'URBANopt/urbanopt-reopt-gem', branch: 'develop'
 end

LICENSE.md

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

example_files/reopt/base_assumptions.json

@@ -27,6 +27,7 @@
     "net_metering_limit_kw": 0.0
   },
   "ElectricLoad": {
+    "year": 2017,
     "critical_loads_kw_is_net": false,
     "critical_load_fraction": 0,
     "loads_kw_is_net": true

example_files/reopt/multiPV_assumptions.json

@@ -27,7 +27,7 @@
     "net_metering_limit_kw": 0.0
   },
   "ElectricLoad": {
-    "year": 2018,
+    "year": 2017,
     "critical_loads_kw_is_net": false,
     "critical_load_fraction": 0,
     "loads_kw_is_net": true

lib/uo_cli/version.rb

@@ -5,6 +5,6 @@
 
 module URBANopt
   module CLI
-    VERSION = '1.0.0'.freeze
+    VERSION = '1.0.1'.freeze
   end
 end

spec/spec_files/reopt/base_assumptions.json

@@ -27,6 +27,7 @@
     "net_metering_limit_kw": 0.0
   },
   "ElectricLoad": {
+    "year": 2017,
     "critical_loads_kw_is_net": false,
     "critical_load_fraction": 0,
     "loads_kw_is_net": true

spec/spec_files/reopt/multiPV_assumptions.json

@@ -27,7 +27,7 @@
     "net_metering_limit_kw": 0.0
   },
   "ElectricLoad": {
-    "year": 2018,
+    "year": 2017,
     "critical_loads_kw_is_net": false,
     "critical_load_fraction": 0,
     "loads_kw_is_net": true