diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c956ea..acd8c6c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # URBANopt Core Gem +## Version 0.8.0 +Date Range: 11/23/21 - 04/21/22 + +- Fixed [#41]( https://github.com/urbanopt/urbanopt-core-gem/pull/41 ), Update licenses + ## Version 0.7.0 Date Range: 07/02/21 - 11/22/21 diff --git a/Gemfile b/Gemfile index 8f2506a..15274ca 100644 --- a/Gemfile +++ b/Gemfile @@ -14,5 +14,5 @@ allow_local = ENV['FAVOR_LOCAL_GEMS'] if allow_local && File.exist?('../OpenStudio-extension-gem') gem 'openstudio-extension', path: '../OpenStudio-extension-gem' elsif allow_local - gem 'openstudio-extension', github: 'NREL/OpenStudio-extension-gem', branch: 'develop' + gem 'openstudio-extension', github: 'NREL/OpenStudio-extension-gem', branch: 'develop' end diff --git a/LICENSE.md b/LICENSE.md index a67eeab..c941187 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,18 +1,18 @@ -URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other +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, +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 +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 +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 + +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 @@ -25,13 +25,14 @@ 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 + +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. diff --git a/doc_templates/LICENSE.md b/doc_templates/LICENSE.md index a6bdc39..c941187 100644 --- a/doc_templates/LICENSE.md +++ b/doc_templates/LICENSE.md @@ -1,18 +1,18 @@ -URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other +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, +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 +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 +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 + +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 @@ -26,13 +26,13 @@ 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 +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. diff --git a/doc_templates/copyright_erb.txt b/doc_templates/copyright_erb.txt index 0ddbba3..1f2ece4 100644 --- a/doc_templates/copyright_erb.txt +++ b/doc_templates/copyright_erb.txt @@ -1,6 +1,6 @@ <% # ********************************************************************************* - # URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other + # 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, @@ -38,4 +38,4 @@ # OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED # OF THE POSSIBILITY OF SUCH DAMAGE. # ********************************************************************************* -%> \ No newline at end of file +%> diff --git a/doc_templates/copyright_js.txt b/doc_templates/copyright_js.txt index 00141c9..12615d5 100644 --- a/doc_templates/copyright_js.txt +++ b/doc_templates/copyright_js.txt @@ -1,4 +1,4 @@ /* @preserve - * URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved. + * URBANopt™, 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. -*/ \ No newline at end of file +*/ diff --git a/doc_templates/copyright_ruby.txt b/doc_templates/copyright_ruby.txt index 55313d2..80183ff 100644 --- a/doc_templates/copyright_ruby.txt +++ b/doc_templates/copyright_ruby.txt @@ -1,5 +1,5 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other +# 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, @@ -36,4 +36,4 @@ # 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. -# ********************************************************************************* \ No newline at end of file +# ********************************************************************************* diff --git a/lib/urbanopt/core.rb b/lib/urbanopt/core.rb index 31c5354..39c1e4a 100644 --- a/lib/urbanopt/core.rb +++ b/lib/urbanopt/core.rb @@ -1,5 +1,5 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other +# 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, diff --git a/lib/urbanopt/core/extension.rb b/lib/urbanopt/core/extension.rb index cb7e49a..a069fd9 100644 --- a/lib/urbanopt/core/extension.rb +++ b/lib/urbanopt/core/extension.rb @@ -1,5 +1,5 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other +# 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, diff --git a/lib/urbanopt/core/feature.rb b/lib/urbanopt/core/feature.rb index 97066db..2b3e634 100644 --- a/lib/urbanopt/core/feature.rb +++ b/lib/urbanopt/core/feature.rb @@ -1,5 +1,5 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other +# 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, diff --git a/lib/urbanopt/core/feature_file.rb b/lib/urbanopt/core/feature_file.rb index eb69198..dfb2dd0 100644 --- a/lib/urbanopt/core/feature_file.rb +++ b/lib/urbanopt/core/feature_file.rb @@ -1,5 +1,5 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other +# 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, diff --git a/lib/urbanopt/core/version.rb b/lib/urbanopt/core/version.rb index 6b0a140..0846d78 100644 --- a/lib/urbanopt/core/version.rb +++ b/lib/urbanopt/core/version.rb @@ -1,5 +1,5 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other +# 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, @@ -40,6 +40,6 @@ module URBANopt module Core - VERSION = '0.7.0'.freeze + VERSION = '0.8.0'.freeze end end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 305803e..65d2f15 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,5 +1,5 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other +# 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, diff --git a/spec/urbanopt/urbanopt_core_spec.rb b/spec/urbanopt/urbanopt_core_spec.rb index 98b655a..b737a03 100644 --- a/spec/urbanopt/urbanopt_core_spec.rb +++ b/spec/urbanopt/urbanopt_core_spec.rb @@ -1,5 +1,5 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other +# 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, diff --git a/urbanopt-core-gem.gemspec b/urbanopt-core-gem.gemspec index ba20301..03845ef 100644 --- a/urbanopt-core-gem.gemspec +++ b/urbanopt-core-gem.gemspec @@ -1,4 +1,3 @@ - lib = File.expand_path('lib', __dir__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) require 'urbanopt/core/version'