-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #447 from urbanopt/develop
Version 0.11.0
- Loading branch information
Showing
714 changed files
with
360,717 additions
and
231,605 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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: | ||
| - "*" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,61 +1,71 @@ | ||
| 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 | ||
| # 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 | ||
| 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 | ||
| simulation-type: [basic, GEB, residential, electric] | ||
| # python-version: No need to test more than 1 python-version | ||
| runs-on: ubuntu-latest | ||
| container: | ||
| image: docker://nrel/openstudio:3.6.1 | ||
| image: docker://nrel/openstudio:3.7.0 | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - 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: Set up Python | ||
| uses: actions/setup-python@v4 | ||
| if: ${{ matrix.simulation-type == 'electric' }} | ||
| uses: actions/setup-python@v5 | ||
| with: | ||
| # Disco needs python 3.10 | ||
| # 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 | ||
| 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 == 'basic' }} | ||
| 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/ | ||
| spec/test_directory**/ | ||
| 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" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.