From c514d874d48482df89988056deaaa11c67183dd0 Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Thu, 6 Jul 2023 10:22:27 -0600 Subject: [PATCH 01/21] use OSv3.6.1 in GHA CI, and run immediately for testing --- .github/workflows/nightly_build.yml | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/.github/workflows/nightly_build.yml b/.github/workflows/nightly_build.yml index e2cd3c5..8f381f1 100644 --- a/.github/workflows/nightly_build.yml +++ b/.github/workflows/nightly_build.yml @@ -2,17 +2,11 @@ name: nightly_build on: - # push: - schedule: + push: + # schedule: # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule # 5 am UTC (11pm MDT the day before) every weekday night in MDT - - cron: '21 5 * * 2-6' - -# Cancels an existing job (of the same workflow) if it is still running -# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#example-only-cancel-in-progress-jobs-or-runs-for-the-current-workflow -# concurrency: -# group: ${{ github.workflow }}-${{ github.ref }} -# cancel-in-progress: true + # - cron: '21 5 * * 2-6' env: # This env var should enforce develop branch of all dependencies @@ -25,7 +19,7 @@ jobs: # https://github.com/rbenv/ruby-build/discussions/1940 runs-on: ubuntu-latest container: - image: docker://nrel/openstudio:3.5.1 + image: docker://nrel/openstudio:3.6.1 steps: - uses: actions/checkout@v3 - name: Update gems @@ -34,7 +28,7 @@ jobs: run: bundle exec rspec # coveralls action docs: https://github.com/marketplace/actions/coveralls-github-action - name: Coveralls - uses: coverallsapp/github-action@master + uses: coverallsapp/github-action@v2 with: github-token: ${{ secrets.GITHUB_TOKEN }} path-to-lcov: "./coverage/lcov/urbanopt-scenario-gem.lcov" From 39cb2339df9bfac4c4374ebe3cb401a5a27f88cd Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Thu, 6 Jul 2023 10:23:27 -0600 Subject: [PATCH 02/21] don't use released versions of UO dependencies --- urbanopt-scenario-gem.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/urbanopt-scenario-gem.gemspec b/urbanopt-scenario-gem.gemspec index 0db47f5..79a9704 100644 --- a/urbanopt-scenario-gem.gemspec +++ b/urbanopt-scenario-gem.gemspec @@ -33,6 +33,6 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency 'json-schema', '~> 2.8' spec.add_runtime_dependency 'sqlite3', '1.4.2' - spec.add_runtime_dependency 'urbanopt-core', '~> 0.9.0' - spec.add_runtime_dependency 'urbanopt-reporting', '~> 0.7.0' + # spec.add_runtime_dependency 'urbanopt-core', '~> 0.9.0' + # spec.add_runtime_dependency 'urbanopt-reporting', '~> 0.7.0' end From 3c314f81e5aee313a389446c18e6308dae6f14a4 Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Thu, 6 Jul 2023 10:23:57 -0600 Subject: [PATCH 03/21] use os361 branches of uo dependencies --- Gemfile | 4 ++-- spec/files/Gemfile | 33 ++++++++++++++++++--------------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/Gemfile b/Gemfile index 7e94379..495dd20 100644 --- a/Gemfile +++ b/Gemfile @@ -23,7 +23,7 @@ allow_local = ENV['FAVOR_LOCAL_GEMS'] # if allow_local && File.exist?('../urbanopt-core-gem') # gem 'urbanopt-core', path: '../urbanopt-core-gem' # elsif allow_local -# gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'develop' + gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'develop' # end # if allow_local && File.exist?('../openstudio-common-measures-gem') @@ -41,7 +41,7 @@ allow_local = ENV['FAVOR_LOCAL_GEMS'] # if allow_local && File.exist?('../urbanopt-reporting-gem') # gem 'urbanopt-reporting', path: '../urbanopt-reporting-gem' # elsif allow_local -# gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'develop' + gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'os361' # end # if allow_local && File.exist?('../openstudio-load-flexibility-measures-gem') diff --git a/spec/files/Gemfile b/spec/files/Gemfile index a37a0ae..d2aaf80 100644 --- a/spec/files/Gemfile +++ b/spec/files/Gemfile @@ -22,11 +22,14 @@ allow_local = ENV['FAVOR_LOCAL_GEMS'] # if allow_local && File.exist?('../urbanopt-core-gem') # gem 'urbanopt-core', path: '../urbanopt-core-gem' # elsif allow_local -# gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'develop' + gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'develop' # end # +# pin this dependency to avoid unicode_normalize error gem 'addressable', '2.8.1' +# pin this dependency to avoid using racc dependency (which has native extensions) +gem 'parser', '3.2.2.2' if allow_local && File.exist?('../openstudio-common-measures-gem') gem 'openstudio-common-measures', path: '../openstudio-common-measures-gem' @@ -68,21 +71,21 @@ else gem 'openstudio-calibration', '~> 0.7.0' end -if allow_local && File.exist?('../urbanopt-geojson-gem') - gem 'urbanopt-geojson', path: '../urbanopt-geojson-gem' -elsif allow_local - gem 'urbanopt-geojson', github: 'URBANopt/urbanopt-geojson-gem', branch: 'develop' -else - gem 'urbanopt-geojson', '~> 0.9.0' -end +# if allow_local && File.exist?('../urbanopt-geojson-gem') +# gem 'urbanopt-geojson', path: '../urbanopt-geojson-gem' +# elsif allow_local + gem 'urbanopt-geojson', github: 'URBANopt/urbanopt-geojson-gem', branch: 'os361' +# else +# gem 'urbanopt-geojson', '~> 0.9.0' +# end # NEVER put SCENARIO-GEM in this file...it will make all simulations fail due to the sqlite dependency # gem 'urbanopt-scenario', github: 'URBANopt/urbanopt-scenario-gem', branch: 'develop' -if allow_local && File.exist?('../urbanopt-reporting-gem') - gem 'urbanopt-reporting', path: '../urbanopt-reporting-gem' -elsif allow_local - gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'develop' -else - gem 'urbanopt-reporting', '~> 0.7.0' -end +# if allow_local && File.exist?('../urbanopt-reporting-gem') +# gem 'urbanopt-reporting', path: '../urbanopt-reporting-gem' +# elsif allow_local + gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'os361' +# else +# gem 'urbanopt-reporting', '~> 0.7.0' +# end From b057d01d811d9d29e05cc63e4afe6c5455282826 Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Thu, 6 Jul 2023 10:24:22 -0600 Subject: [PATCH 04/21] add badge for GHA CI nightly build status --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index bcde718..fdfe60b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # URBANopt Scenario Gem [![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) +[![nightly_build](https://github.com/urbanopt/urbanopt-scenario-gem/actions/workflows/nightly_build.yml/badge.svg)](https://github.com/urbanopt/urbanopt-scenario-gem/actions/workflows/nightly_build.yml) The URBANopt™ Scenario Gem includes functionality for defining scenarios, running simulations, and post-processing results. User defined SimulationMapper classes translate each Feature to a SimulationDir which is a directory containing simulation input files. The ScenarioRunner is used to perform simulations for each SimulationDir. Finally, a ScenarioPostProcessor can run on a Scenario to generate scenario level results. From 1bbe2c51ae5205baf7daa89f42e24027dce2db5f Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Thu, 6 Jul 2023 10:31:20 -0600 Subject: [PATCH 05/21] update license templates --- doc_templates/LICENSE.md | 27 +++++----- doc_templates/copyright_erb.txt | 84 +++++++++++++++++--------------- doc_templates/copyright_js.txt | 4 +- doc_templates/copyright_ruby.txt | 39 +-------------- 4 files changed, 65 insertions(+), 89 deletions(-) diff --git a/doc_templates/LICENSE.md b/doc_templates/LICENSE.md index 1ff779b..afc9eb1 100644 --- a/doc_templates/LICENSE.md +++ b/doc_templates/LICENSE.md @@ -1,4 +1,4 @@ -URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other +URBANopt (tm), Copyright (c) 2019-2023, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -25,13 +25,18 @@ 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. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 OR CONTRIBUTORS 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. +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. diff --git a/doc_templates/copyright_erb.txt b/doc_templates/copyright_erb.txt index bbaba69..2183890 100644 --- a/doc_templates/copyright_erb.txt +++ b/doc_templates/copyright_erb.txt @@ -1,41 +1,47 @@ <% -# ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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: - -# 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. - -# 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. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 OR CONTRIBUTORS 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. -# ********************************************************************************* + # ********************************************************************************* + # URBANopt (tm), Copyright (c) 2019-2023, 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: + + # 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. + + # 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. + + # 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. + + # ********************************************************************************* %> diff --git a/doc_templates/copyright_js.txt b/doc_templates/copyright_js.txt index 8fa8c1a..40bae6d 100644 --- a/doc_templates/copyright_js.txt +++ b/doc_templates/copyright_js.txt @@ -1,4 +1,4 @@ /* @preserve - * URBANopt (tm), Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved. - * Use of this source code is governed by the BSD 3-Clause license. + * URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. + * See also https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md */ diff --git a/doc_templates/copyright_ruby.txt b/doc_templates/copyright_ruby.txt index 95da28c..5b3158b 100644 --- a/doc_templates/copyright_ruby.txt +++ b/doc_templates/copyright_ruby.txt @@ -1,39 +1,4 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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: - -# 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. - -# 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. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 OR CONTRIBUTORS 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. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md # ********************************************************************************* From d2b5ec5e0f858ac032be8b1ed55372b5f0a88ecc Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Thu, 6 Jul 2023 10:31:29 -0600 Subject: [PATCH 06/21] bump to version 0.10.0 --- lib/urbanopt/scenario/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/urbanopt/scenario/version.rb b/lib/urbanopt/scenario/version.rb index 3481123..2c49d10 100644 --- a/lib/urbanopt/scenario/version.rb +++ b/lib/urbanopt/scenario/version.rb @@ -40,6 +40,6 @@ module URBANopt module Scenario - VERSION = '0.9.0'.freeze + VERSION = '0.10.0'.freeze end end From 7f50c4b36c163d9eb74cad50a84e87e1c3494870 Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Thu, 6 Jul 2023 10:34:46 -0600 Subject: [PATCH 07/21] fix copy/paste typo in doc template --- doc_templates/copyright_js.txt | 2 +- doc_templates/copyright_ruby.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc_templates/copyright_js.txt b/doc_templates/copyright_js.txt index 40bae6d..8e16ac2 100644 --- a/doc_templates/copyright_js.txt +++ b/doc_templates/copyright_js.txt @@ -1,4 +1,4 @@ /* @preserve * URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. - * See also https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md + * See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md */ diff --git a/doc_templates/copyright_ruby.txt b/doc_templates/copyright_ruby.txt index 5b3158b..3028959 100644 --- a/doc_templates/copyright_ruby.txt +++ b/doc_templates/copyright_ruby.txt @@ -1,4 +1,4 @@ # ********************************************************************************* # URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. -# See also https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* From 2e3c5ce43f5a29998efb8561eccfc26601da4ff1 Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Thu, 6 Jul 2023 10:35:15 -0600 Subject: [PATCH 08/21] update license text using OS rake task --- LICENSE.md | 27 +++++++------ lib/urbanopt-scenario.rb | 39 +------------------ lib/urbanopt/scenario.rb | 39 +------------------ lib/urbanopt/scenario/default_reports.rb | 39 +------------------ lib/urbanopt/scenario/extension.rb | 39 +------------------ lib/urbanopt/scenario/logger.rb | 39 +------------------ lib/urbanopt/scenario/scenario_base.rb | 39 +------------------ lib/urbanopt/scenario/scenario_csv.rb | 39 +------------------ .../scenario/scenario_datapoint_base.rb | 39 +------------------ .../scenario/scenario_post_processor_base.rb | 39 +------------------ .../scenario_post_processor_default.rb | 39 +------------------ .../scenario/scenario_post_processor_disco.rb | 39 +------------------ .../scenario_post_processor_opendss.rb | 39 +------------------ lib/urbanopt/scenario/scenario_runner_base.rb | 39 +------------------ lib/urbanopt/scenario/scenario_runner_osw.rb | 39 +------------------ .../scenario/scenario_visualization.rb | 39 +------------------ lib/urbanopt/scenario/simulation_dir_base.rb | 39 +------------------ lib/urbanopt/scenario/simulation_dir_osw.rb | 39 +------------------ .../scenario/simulation_mapper_base.rb | 39 +------------------ lib/urbanopt/scenario/version.rb | 39 +------------------ spec/files/example_feature_file.rb | 39 +------------------ spec/files/mappers/TestMapper1.rb | 39 +------------------ spec/spec_helper.rb | 39 +------------------ .../urbanopt_scenario_reports_spec.rb | 39 +------------------ spec/urbanopt/urbanopt_scenario_spec.rb | 39 +------------------ 25 files changed, 64 insertions(+), 899 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 1ff779b..afc9eb1 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other +URBANopt (tm), Copyright (c) 2019-2023, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -25,13 +25,18 @@ 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. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 OR CONTRIBUTORS 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. +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. diff --git a/lib/urbanopt-scenario.rb b/lib/urbanopt-scenario.rb index 9cb640d..c0f4603 100644 --- a/lib/urbanopt-scenario.rb +++ b/lib/urbanopt-scenario.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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: - -# 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. - -# 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. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 OR CONTRIBUTORS 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. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* require_relative 'urbanopt/scenario' diff --git a/lib/urbanopt/scenario.rb b/lib/urbanopt/scenario.rb index f2c850d..5f7092b 100644 --- a/lib/urbanopt/scenario.rb +++ b/lib/urbanopt/scenario.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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: - -# 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. - -# 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. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 OR CONTRIBUTORS 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. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'urbanopt/scenario/version' diff --git a/lib/urbanopt/scenario/default_reports.rb b/lib/urbanopt/scenario/default_reports.rb index 07591d6..4d57e91 100644 --- a/lib/urbanopt/scenario/default_reports.rb +++ b/lib/urbanopt/scenario/default_reports.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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: - -# 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. - -# 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. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 OR CONTRIBUTORS 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. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* ## diff --git a/lib/urbanopt/scenario/extension.rb b/lib/urbanopt/scenario/extension.rb index 235c3b0..2158577 100644 --- a/lib/urbanopt/scenario/extension.rb +++ b/lib/urbanopt/scenario/extension.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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: - -# 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. - -# 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. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 OR CONTRIBUTORS 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. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'openstudio/extension' diff --git a/lib/urbanopt/scenario/logger.rb b/lib/urbanopt/scenario/logger.rb index dfbae79..2311396 100644 --- a/lib/urbanopt/scenario/logger.rb +++ b/lib/urbanopt/scenario/logger.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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: - -# 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. - -# 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. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 OR CONTRIBUTORS 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. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'logger' diff --git a/lib/urbanopt/scenario/scenario_base.rb b/lib/urbanopt/scenario/scenario_base.rb index 6626786..9d5996c 100644 --- a/lib/urbanopt/scenario/scenario_base.rb +++ b/lib/urbanopt/scenario/scenario_base.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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: - -# 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. - -# 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. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 OR CONTRIBUTORS 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. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* module URBANopt diff --git a/lib/urbanopt/scenario/scenario_csv.rb b/lib/urbanopt/scenario/scenario_csv.rb index f5cbc5f..7c72e26 100644 --- a/lib/urbanopt/scenario/scenario_csv.rb +++ b/lib/urbanopt/scenario/scenario_csv.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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: - -# 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. - -# 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. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 OR CONTRIBUTORS 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. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'urbanopt/scenario/scenario_base' diff --git a/lib/urbanopt/scenario/scenario_datapoint_base.rb b/lib/urbanopt/scenario/scenario_datapoint_base.rb index 33d1e75..bf3e175 100644 --- a/lib/urbanopt/scenario/scenario_datapoint_base.rb +++ b/lib/urbanopt/scenario/scenario_datapoint_base.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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: - -# 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. - -# 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. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 OR CONTRIBUTORS 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. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* module URBANopt diff --git a/lib/urbanopt/scenario/scenario_post_processor_base.rb b/lib/urbanopt/scenario/scenario_post_processor_base.rb index c498ee6..8b0dc9e 100644 --- a/lib/urbanopt/scenario/scenario_post_processor_base.rb +++ b/lib/urbanopt/scenario/scenario_post_processor_base.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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: - -# 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. - -# 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. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 OR CONTRIBUTORS 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. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* module URBANopt diff --git a/lib/urbanopt/scenario/scenario_post_processor_default.rb b/lib/urbanopt/scenario/scenario_post_processor_default.rb index 8c6394a..012d23b 100644 --- a/lib/urbanopt/scenario/scenario_post_processor_default.rb +++ b/lib/urbanopt/scenario/scenario_post_processor_default.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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: - -# 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. - -# 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. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 OR CONTRIBUTORS 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. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'urbanopt/scenario/scenario_post_processor_base' diff --git a/lib/urbanopt/scenario/scenario_post_processor_disco.rb b/lib/urbanopt/scenario/scenario_post_processor_disco.rb index 0d783b1..1b38ff4 100644 --- a/lib/urbanopt/scenario/scenario_post_processor_disco.rb +++ b/lib/urbanopt/scenario/scenario_post_processor_disco.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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: - -# 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. - -# 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. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 OR CONTRIBUTORS 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. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'urbanopt/reporting/default_reports' diff --git a/lib/urbanopt/scenario/scenario_post_processor_opendss.rb b/lib/urbanopt/scenario/scenario_post_processor_opendss.rb index 2e891c2..fc34892 100644 --- a/lib/urbanopt/scenario/scenario_post_processor_opendss.rb +++ b/lib/urbanopt/scenario/scenario_post_processor_opendss.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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: - -# 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. - -# 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. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 OR CONTRIBUTORS 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. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* # require 'urbanopt/scenario/scenario_post_processor_base' diff --git a/lib/urbanopt/scenario/scenario_runner_base.rb b/lib/urbanopt/scenario/scenario_runner_base.rb index 3677a32..6851f7a 100644 --- a/lib/urbanopt/scenario/scenario_runner_base.rb +++ b/lib/urbanopt/scenario/scenario_runner_base.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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: - -# 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. - -# 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. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 OR CONTRIBUTORS 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. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* module URBANopt diff --git a/lib/urbanopt/scenario/scenario_runner_osw.rb b/lib/urbanopt/scenario/scenario_runner_osw.rb index 858724c..5911c8d 100644 --- a/lib/urbanopt/scenario/scenario_runner_osw.rb +++ b/lib/urbanopt/scenario/scenario_runner_osw.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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: - -# 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. - -# 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. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 OR CONTRIBUTORS 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. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'urbanopt/scenario/scenario_runner_base' diff --git a/lib/urbanopt/scenario/scenario_visualization.rb b/lib/urbanopt/scenario/scenario_visualization.rb index ba5c0fc..414adc9 100644 --- a/lib/urbanopt/scenario/scenario_visualization.rb +++ b/lib/urbanopt/scenario/scenario_visualization.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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: - -# 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. - -# 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. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 OR CONTRIBUTORS 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. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'csv' diff --git a/lib/urbanopt/scenario/simulation_dir_base.rb b/lib/urbanopt/scenario/simulation_dir_base.rb index 6052dc4..666bd39 100644 --- a/lib/urbanopt/scenario/simulation_dir_base.rb +++ b/lib/urbanopt/scenario/simulation_dir_base.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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: - -# 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. - -# 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. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 OR CONTRIBUTORS 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. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* module URBANopt diff --git a/lib/urbanopt/scenario/simulation_dir_osw.rb b/lib/urbanopt/scenario/simulation_dir_osw.rb index 4b614bd..652c26a 100644 --- a/lib/urbanopt/scenario/simulation_dir_osw.rb +++ b/lib/urbanopt/scenario/simulation_dir_osw.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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: - -# 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. - -# 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. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 OR CONTRIBUTORS 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. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'urbanopt/scenario/simulation_dir_base' diff --git a/lib/urbanopt/scenario/simulation_mapper_base.rb b/lib/urbanopt/scenario/simulation_mapper_base.rb index e7ce401..133eb8f 100644 --- a/lib/urbanopt/scenario/simulation_mapper_base.rb +++ b/lib/urbanopt/scenario/simulation_mapper_base.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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: - -# 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. - -# 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. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 OR CONTRIBUTORS 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. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* module URBANopt diff --git a/lib/urbanopt/scenario/version.rb b/lib/urbanopt/scenario/version.rb index 2c49d10..9835fb4 100644 --- a/lib/urbanopt/scenario/version.rb +++ b/lib/urbanopt/scenario/version.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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: - -# 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. - -# 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. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 OR CONTRIBUTORS 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. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* module URBANopt diff --git a/spec/files/example_feature_file.rb b/spec/files/example_feature_file.rb index 3cf6bd2..588bf08 100644 --- a/spec/files/example_feature_file.rb +++ b/spec/files/example_feature_file.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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: - -# 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. - -# 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. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 OR CONTRIBUTORS 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. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'urbanopt/core/feature' diff --git a/spec/files/mappers/TestMapper1.rb b/spec/files/mappers/TestMapper1.rb index 55ab1d6..b943609 100644 --- a/spec/files/mappers/TestMapper1.rb +++ b/spec/files/mappers/TestMapper1.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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: - -# 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. - -# 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. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 OR CONTRIBUTORS 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. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'urbanopt/reporting' diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 6735abf..4e28687 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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: - -# 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. - -# 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. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 OR CONTRIBUTORS 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. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'simplecov' diff --git a/spec/urbanopt/urbanopt_scenario_reports_spec.rb b/spec/urbanopt/urbanopt_scenario_reports_spec.rb index 4945fcb..5837547 100644 --- a/spec/urbanopt/urbanopt_scenario_reports_spec.rb +++ b/spec/urbanopt/urbanopt_scenario_reports_spec.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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: - -# 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. - -# 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. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 OR CONTRIBUTORS 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. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* require_relative '../spec_helper' diff --git a/spec/urbanopt/urbanopt_scenario_spec.rb b/spec/urbanopt/urbanopt_scenario_spec.rb index 204069a..142b37c 100644 --- a/spec/urbanopt/urbanopt_scenario_spec.rb +++ b/spec/urbanopt/urbanopt_scenario_spec.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, 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: - -# 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. - -# 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. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 OR CONTRIBUTORS 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. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* require_relative '../spec_helper' From 57739f1a07f7677b01f6dfd4edd2687f9608c63e Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Thu, 6 Jul 2023 10:38:43 -0600 Subject: [PATCH 09/21] bump sqlite3 dependency from 1.4.2 to 1.6.3 --- urbanopt-scenario-gem.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/urbanopt-scenario-gem.gemspec b/urbanopt-scenario-gem.gemspec index 79a9704..61d89e0 100644 --- a/urbanopt-scenario-gem.gemspec +++ b/urbanopt-scenario-gem.gemspec @@ -32,7 +32,7 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency 'json_pure', '~> 2.3' spec.add_runtime_dependency 'json-schema', '~> 2.8' - spec.add_runtime_dependency 'sqlite3', '1.4.2' + spec.add_runtime_dependency 'sqlite3', '~> 1.6' # spec.add_runtime_dependency 'urbanopt-core', '~> 0.9.0' # spec.add_runtime_dependency 'urbanopt-reporting', '~> 0.7.0' end From 86ab052b97f13109681ac656d51169ca79ede031 Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Thu, 6 Jul 2023 10:41:32 -0600 Subject: [PATCH 10/21] update changelog for v0.10.0 --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32e8f4c..2a0828c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # URBANopt Scenario Gem +## Version 0.10.0 +Date Range: 12/5/22 - 7/6/23 + +- Update dependencies for OpenStudio 3.6.1 +- Update license and references to the license file +- Bump sqlite3 dependency from 1.4.2 to 1.6.3 +- Add badge for GHA CI nightly build status + ## Version 0.9.0 Date Range: 05/11/22 - 12/05/22 From 70e42143b49ce499213fe97649695e58ecbfcc8d Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Thu, 6 Jul 2023 10:46:08 -0600 Subject: [PATCH 11/21] rename GHA CI config file to force it to run --- .github/workflows/{nightly_build.yml => nightly_ci_build.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{nightly_build.yml => nightly_ci_build.yml} (100%) diff --git a/.github/workflows/nightly_build.yml b/.github/workflows/nightly_ci_build.yml similarity index 100% rename from .github/workflows/nightly_build.yml rename to .github/workflows/nightly_ci_build.yml From 59512a03e56e1ef2a0ef313f319e488b0821366a Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Thu, 6 Jul 2023 11:19:20 -0600 Subject: [PATCH 12/21] restore scheduled CI build --- .github/workflows/nightly_ci_build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/nightly_ci_build.yml b/.github/workflows/nightly_ci_build.yml index 8f381f1..a6b59f5 100644 --- a/.github/workflows/nightly_ci_build.yml +++ b/.github/workflows/nightly_ci_build.yml @@ -2,11 +2,11 @@ name: nightly_build on: - push: - # schedule: + # push: + schedule: # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule # 5 am UTC (11pm MDT the day before) every weekday night in MDT - # - cron: '21 5 * * 2-6' + - cron: '21 5 * * 2-6' env: # This env var should enforce develop branch of all dependencies From 36065f398f4f900e2432da2ec4916c86f70c983b Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Thu, 6 Jul 2023 11:26:13 -0600 Subject: [PATCH 13/21] move comment to reduce confusion --- .github/workflows/nightly_ci_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly_ci_build.yml b/.github/workflows/nightly_ci_build.yml index a6b59f5..250102c 100644 --- a/.github/workflows/nightly_ci_build.yml +++ b/.github/workflows/nightly_ci_build.yml @@ -26,8 +26,8 @@ jobs: run: bundle update - name: Run Rspec run: bundle exec rspec - # coveralls action docs: https://github.com/marketplace/actions/coveralls-github-action - name: Coveralls + # coveralls action docs: https://github.com/marketplace/actions/coveralls-github-action uses: coverallsapp/github-action@v2 with: github-token: ${{ secrets.GITHUB_TOKEN }} From 2ffcc1cb47a452fab794db1ab4e8dd702acc79cd Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Thu, 6 Jul 2023 11:28:08 -0600 Subject: [PATCH 14/21] fix formatting typo in license template --- doc_templates/copyright_erb.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc_templates/copyright_erb.txt b/doc_templates/copyright_erb.txt index 2183890..4a8867e 100644 --- a/doc_templates/copyright_erb.txt +++ b/doc_templates/copyright_erb.txt @@ -3,7 +3,7 @@ # URBANopt (tm), Copyright (c) 2019-2023, Alliance for Sustainable Energy, LLC, and other # contributors. All rights reserved. -Redistribution and use in source and binary forms, with or without modification, + # 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 From c31fe445be1af6fc43c78dce792fcd7dd75d5968 Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Thu, 6 Jul 2023 14:29:46 -0600 Subject: [PATCH 15/21] remove redundant dependencies, captured in lower UO dependencies --- urbanopt-scenario-gem.gemspec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/urbanopt-scenario-gem.gemspec b/urbanopt-scenario-gem.gemspec index 61d89e0..c8f4879 100644 --- a/urbanopt-scenario-gem.gemspec +++ b/urbanopt-scenario-gem.gemspec @@ -28,10 +28,6 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'rspec', '~> 3.9' spec.add_development_dependency 'simplecov', '~> 0.18.2' spec.add_development_dependency 'simplecov-lcov', '~> 0.8.0' - - spec.add_runtime_dependency 'json_pure', '~> 2.3' - spec.add_runtime_dependency 'json-schema', '~> 2.8' - spec.add_runtime_dependency 'sqlite3', '~> 1.6' # spec.add_runtime_dependency 'urbanopt-core', '~> 0.9.0' # spec.add_runtime_dependency 'urbanopt-reporting', '~> 0.7.0' From 7de765e0722961ea641bbaff6746e44294d322fa Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Fri, 7 Jul 2023 08:53:42 -0600 Subject: [PATCH 16/21] point to new core-gem branch --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 495dd20..a9915df 100644 --- a/Gemfile +++ b/Gemfile @@ -23,7 +23,7 @@ allow_local = ENV['FAVOR_LOCAL_GEMS'] # if allow_local && File.exist?('../urbanopt-core-gem') # gem 'urbanopt-core', path: '../urbanopt-core-gem' # elsif allow_local - gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'develop' + gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'more-361-updates' # end # if allow_local && File.exist?('../openstudio-common-measures-gem') From 720d3bdbbb0697db59f3f48b37f70b767cfd66e0 Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Fri, 7 Jul 2023 08:54:06 -0600 Subject: [PATCH 17/21] use new OS-gems in spec-files --- spec/files/Gemfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/spec/files/Gemfile b/spec/files/Gemfile index d2aaf80..84e5218 100644 --- a/spec/files/Gemfile +++ b/spec/files/Gemfile @@ -22,7 +22,7 @@ allow_local = ENV['FAVOR_LOCAL_GEMS'] # if allow_local && File.exist?('../urbanopt-core-gem') # gem 'urbanopt-core', path: '../urbanopt-core-gem' # elsif allow_local - gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'develop' + gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'more-361-updates' # end # @@ -36,7 +36,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.7.0' + gem 'openstudio-common-measures', '~> 0.8.0' end if allow_local && File.exist?('../openstudio-model-articulation-gem') @@ -44,7 +44,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.7.0' + gem 'openstudio-model-articulation', '~> 0.8.0' end if allow_local && File.exist?('../openstudio-load-flexibility-measures-gem') @@ -52,7 +52,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: 'master' else - gem 'openstudio-load-flexibility-measures', '~> 0.6.1' + gem 'openstudio-load-flexibility-measures', '~> 0.7.0' end if allow_local && File.exist?('../openstudio-ee-gem') @@ -60,7 +60,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.7.0' + gem 'openstudio-ee', '~> 0.8.0' end if allow_local && File.exist?('../openstudio-calibration-gem') @@ -68,7 +68,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.7.0' + gem 'openstudio-calibration', '~> 0.8.0' end # if allow_local && File.exist?('../urbanopt-geojson-gem') From d905b5924a030d08dbe4c14108660cd729769f38 Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Fri, 7 Jul 2023 10:55:34 -0600 Subject: [PATCH 18/21] run gha ci for testing --- .github/workflows/nightly_ci_build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/nightly_ci_build.yml b/.github/workflows/nightly_ci_build.yml index 250102c..aefc7d7 100644 --- a/.github/workflows/nightly_ci_build.yml +++ b/.github/workflows/nightly_ci_build.yml @@ -2,11 +2,11 @@ name: nightly_build on: - # push: - schedule: + push: + # schedule: # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule # 5 am UTC (11pm MDT the day before) every weekday night in MDT - - cron: '21 5 * * 2-6' + # - cron: '21 5 * * 2-6' env: # This env var should enforce develop branch of all dependencies From 837e0d5f47c8c6705eb9fc554594796fbe73d6b4 Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Fri, 7 Jul 2023 11:02:07 -0600 Subject: [PATCH 19/21] go back to scheduled gha ci runs --- .github/workflows/nightly_ci_build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/nightly_ci_build.yml b/.github/workflows/nightly_ci_build.yml index aefc7d7..250102c 100644 --- a/.github/workflows/nightly_ci_build.yml +++ b/.github/workflows/nightly_ci_build.yml @@ -2,11 +2,11 @@ name: nightly_build on: - push: - # schedule: + # push: + schedule: # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule # 5 am UTC (11pm MDT the day before) every weekday night in MDT - # - cron: '21 5 * * 2-6' + - cron: '21 5 * * 2-6' env: # This env var should enforce develop branch of all dependencies From fa9b205b6b70885eebf2bbc1e8e2c1b0e9446720 Mon Sep 17 00:00:00 2001 From: kflemin <2205659+kflemin@users.noreply.github.com> Date: Thu, 20 Jul 2023 16:40:38 -0600 Subject: [PATCH 20/21] update dependencies --- Gemfile | 4 ++-- urbanopt-scenario-gem.gemspec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index a9915df..08e039f 100644 --- a/Gemfile +++ b/Gemfile @@ -23,7 +23,7 @@ allow_local = ENV['FAVOR_LOCAL_GEMS'] # if allow_local && File.exist?('../urbanopt-core-gem') # gem 'urbanopt-core', path: '../urbanopt-core-gem' # elsif allow_local - gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'more-361-updates' +# gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'develop' # end # if allow_local && File.exist?('../openstudio-common-measures-gem') @@ -41,7 +41,7 @@ allow_local = ENV['FAVOR_LOCAL_GEMS'] # if allow_local && File.exist?('../urbanopt-reporting-gem') # gem 'urbanopt-reporting', path: '../urbanopt-reporting-gem' # elsif allow_local - gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'os361' +# gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'develop' # end # if allow_local && File.exist?('../openstudio-load-flexibility-measures-gem') diff --git a/urbanopt-scenario-gem.gemspec b/urbanopt-scenario-gem.gemspec index c8f4879..b9e1837 100644 --- a/urbanopt-scenario-gem.gemspec +++ b/urbanopt-scenario-gem.gemspec @@ -29,6 +29,6 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'simplecov', '~> 0.18.2' spec.add_development_dependency 'simplecov-lcov', '~> 0.8.0' spec.add_runtime_dependency 'sqlite3', '~> 1.6' - # spec.add_runtime_dependency 'urbanopt-core', '~> 0.9.0' - # spec.add_runtime_dependency 'urbanopt-reporting', '~> 0.7.0' + spec.add_runtime_dependency 'urbanopt-core', '~> 0.10.0' + spec.add_runtime_dependency 'urbanopt-reporting', '~> 0.8.0' end From 4580072fe33eb727e352bd285a845ead97ed2993 Mon Sep 17 00:00:00 2001 From: kflemin <2205659+kflemin@users.noreply.github.com> Date: Thu, 20 Jul 2023 16:52:01 -0600 Subject: [PATCH 21/21] fix test gemfile --- spec/files/Gemfile | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/spec/files/Gemfile b/spec/files/Gemfile index 84e5218..c75e8bb 100644 --- a/spec/files/Gemfile +++ b/spec/files/Gemfile @@ -22,7 +22,7 @@ allow_local = ENV['FAVOR_LOCAL_GEMS'] # if allow_local && File.exist?('../urbanopt-core-gem') # gem 'urbanopt-core', path: '../urbanopt-core-gem' # elsif allow_local - gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'more-361-updates' +# gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'develop' # end # @@ -71,21 +71,21 @@ else gem 'openstudio-calibration', '~> 0.8.0' end -# if allow_local && File.exist?('../urbanopt-geojson-gem') -# gem 'urbanopt-geojson', path: '../urbanopt-geojson-gem' -# elsif allow_local - gem 'urbanopt-geojson', github: 'URBANopt/urbanopt-geojson-gem', branch: 'os361' -# else -# gem 'urbanopt-geojson', '~> 0.9.0' -# end +if allow_local && File.exist?('../urbanopt-geojson-gem') + gem 'urbanopt-geojson', path: '../urbanopt-geojson-gem' +elsif allow_local + gem 'urbanopt-geojson', github: 'URBANopt/urbanopt-geojson-gem', branch: 'develop' +else + gem 'urbanopt-geojson', '~> 0.10.0' +end # NEVER put SCENARIO-GEM in this file...it will make all simulations fail due to the sqlite dependency # gem 'urbanopt-scenario', github: 'URBANopt/urbanopt-scenario-gem', branch: 'develop' -# if allow_local && File.exist?('../urbanopt-reporting-gem') -# gem 'urbanopt-reporting', path: '../urbanopt-reporting-gem' -# elsif allow_local - gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'os361' -# else -# gem 'urbanopt-reporting', '~> 0.7.0' -# end +if allow_local && File.exist?('../urbanopt-reporting-gem') + gem 'urbanopt-reporting', path: '../urbanopt-reporting-gem' +elsif allow_local + gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'develop' +else + gem 'urbanopt-reporting', '~> 0.8.0' +end