From d7a973caf608004a0db95df42aa6584d3a13baab Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Mon, 20 Nov 2023 11:53:39 -0600 Subject: [PATCH 01/10] point to os37 branch of core-gem for testing --- Gemfile | 4 ++-- urbanopt-geojson-gem.gemspec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 2384067..277e8e7 100644 --- a/Gemfile +++ b/Gemfile @@ -23,7 +23,7 @@ gem 'parser', '3.2.2.2' # end # if allow_local && File.exist?('../urbanopt-core-gem') -# gem 'urbanopt-core', path: '../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: 'os37' # end diff --git a/urbanopt-geojson-gem.gemspec b/urbanopt-geojson-gem.gemspec index 398f806..3528add 100644 --- a/urbanopt-geojson-gem.gemspec +++ b/urbanopt-geojson-gem.gemspec @@ -31,5 +31,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'simplecov-lcov', '~> 0.8.0' spec.add_runtime_dependency 'json-schema', '~> 2.7' - spec.add_runtime_dependency 'urbanopt-core', '~> 0.10.0' + # spec.add_runtime_dependency 'urbanopt-core', '~> 0.10.0' end From d878bdc3234ae0f8e288267cd598e6061e45b8bf Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Mon, 20 Nov 2023 11:53:54 -0600 Subject: [PATCH 02/10] rake openstudio update & test --- lib/measures/urban_geometry_creation/README.md | 2 +- lib/measures/urban_geometry_creation/measure.xml | 14 +++++++------- .../urban_geometry_creation_zoning/measure.xml | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/measures/urban_geometry_creation/README.md b/lib/measures/urban_geometry_creation/README.md index 5fad3b0..c5c4e8a 100644 --- a/lib/measures/urban_geometry_creation/README.md +++ b/lib/measures/urban_geometry_creation/README.md @@ -43,7 +43,7 @@ Select which surrounding buildings to include. **Required:** true, **Model Dependent:** false -### Scale Footprint Area by the Floor Area? +### Scale Footprint Area by the Floor Area If true, the footprint area from GeoJSON will be scaled by the floor_area provided by the user in URBANopt. **Name:** scale_footprint_area_by_floor_area, **Type:** Boolean, diff --git a/lib/measures/urban_geometry_creation/measure.xml b/lib/measures/urban_geometry_creation/measure.xml index 9c02272..c7aa7cd 100644 --- a/lib/measures/urban_geometry_creation/measure.xml +++ b/lib/measures/urban_geometry_creation/measure.xml @@ -3,8 +3,8 @@ 3.1 urban_geometry_creation 5ab85d6b-c9af-4361-8ab9-613ee99a5666 - 7f03040a-cc98-4c54-ae40-f33db7f534b7 - 2023-07-06T15:57:24Z + 583499fb-4275-4787-9168-e3383dca0fc6 + 2023-11-20T17:10:01Z D254E772 UrbanGeometryCreation UrbanGeometryCreation @@ -48,7 +48,7 @@ scale_footprint_area_by_floor_area - Scale Footprint Area by the Floor Area? + Scale Footprint Area by the Floor Area If true, the footprint area from GeoJSON will be scaled by the floor_area provided by the user in URBANopt. Boolean false @@ -114,7 +114,7 @@ README.md md readme - 74F54DC5 + AA2D38B0 README.md.erb @@ -131,7 +131,7 @@ measure.rb rb script - 4B36EB4E + 5D490083 nrel_stm_footprints.geojson @@ -143,13 +143,13 @@ shadowed_tests.rb rb test - 1AD96F0B + 6F2F2CA8 urban_geometry_creation_test.rb rb test - CA11D7FF + 81FF63D2 diff --git a/lib/measures/urban_geometry_creation_zoning/measure.xml b/lib/measures/urban_geometry_creation_zoning/measure.xml index 1796b12..287ed9d 100644 --- a/lib/measures/urban_geometry_creation_zoning/measure.xml +++ b/lib/measures/urban_geometry_creation_zoning/measure.xml @@ -3,8 +3,8 @@ 3.1 urban_geometry_creation_zoning 96ea1317-76ac-4670-b51d-71ee3f4fdd65 - c1c0bf6d-92a2-4a69-9446-e3ebf392c376 - 2023-07-06T15:57:24Z + 4d47bb3f-6e49-4309-a4e0-5f2c3748b947 + 2023-11-20T17:10:01Z D254E772 UrbanGeometryCreationZoning UrbanGeometryCreationZoning @@ -136,7 +136,7 @@ urban_geometry_creation_zoning_test.rb rb test - 5C631B7A + FC65E7CE From ab1beafca459a39294f21138968db161615999c6 Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Thu, 21 Dec 2023 13:12:35 -0700 Subject: [PATCH 03/10] use OS3.7 in CI, and bump `checkout` to v4 --- .github/workflows/nightly_build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly_build.yml b/.github/workflows/nightly_build.yml index 7510953..cafd4ce 100644 --- a/.github/workflows/nightly_build.yml +++ b/.github/workflows/nightly_build.yml @@ -18,9 +18,9 @@ jobs: weeknight-tests: runs-on: ubuntu-latest container: - image: docker://nrel/openstudio:3.6.1 + image: docker://nrel/openstudio:3.7.0 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Update gems run: | ruby --version From e3e2bb330b1669bc36513509aa1dd6cf482dbc11 Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Thu, 21 Dec 2023 13:12:48 -0700 Subject: [PATCH 04/10] bump to version 0.11.0 --- lib/urbanopt/geojson/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/urbanopt/geojson/version.rb b/lib/urbanopt/geojson/version.rb index d97c784..dd69aac 100644 --- a/lib/urbanopt/geojson/version.rb +++ b/lib/urbanopt/geojson/version.rb @@ -5,6 +5,6 @@ module URBANopt module GeoJSON - VERSION = '0.10.0'.freeze + VERSION = '0.11.0'.freeze end end From db83835a14c170e2c082ed026841652558a71cb1 Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Thu, 21 Dec 2023 13:13:36 -0700 Subject: [PATCH 05/10] depend on core-gem v0.11.0 in gemspec --- urbanopt-geojson-gem.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/urbanopt-geojson-gem.gemspec b/urbanopt-geojson-gem.gemspec index 3528add..961431b 100644 --- a/urbanopt-geojson-gem.gemspec +++ b/urbanopt-geojson-gem.gemspec @@ -31,5 +31,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'simplecov-lcov', '~> 0.8.0' spec.add_runtime_dependency 'json-schema', '~> 2.7' - # spec.add_runtime_dependency 'urbanopt-core', '~> 0.10.0' + spec.add_runtime_dependency 'urbanopt-core', '~> 0.11.0' end From 43cf9e96fa215d37c6398c7253f9d715f652914d Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Thu, 21 Dec 2023 13:13:58 -0700 Subject: [PATCH 06/10] uncomment allow_local code in Gemfile --- Gemfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 277e8e7..dbb2985 100644 --- a/Gemfile +++ b/Gemfile @@ -22,8 +22,8 @@ gem 'parser', '3.2.2.2' # gem 'openstudio-extension', github: 'NREL/openstudio-extension-gem', branch: 'develop' # end -# 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: 'os37' -# end +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' +end From a3b927432e7ed6908a6e250ce932b2ae30cd483b Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Thu, 21 Dec 2023 13:14:22 -0700 Subject: [PATCH 07/10] fix copy/paste typo in contributing.md --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 81822d3..91e3e15 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,7 +8,7 @@ The contribution process for URBANopt is composed of three steps: ## 1. Send consent email -In order for us to distribute your code as part of URBANopt under the URBANopt SDK [license](https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md), we’ll need your consent. An email acknowledging your understanding of these terms and agreeing to them is all that will be asked of any contributor. Send an email to the URBANopt project manager ([see below](#documentation) for the address) including the following text and a list of co-contributors (if any): +In order for us to distribute your code as part of URBANopt under the URBANopt SDK [license](https://github.com/urbanopt/urbanopt-geojson-gem/blob/develop/LICENSE.md), we’ll need your consent. An email acknowledging your understanding of these terms and agreeing to them is all that will be asked of any contributor. Send an email to the URBANopt project manager ([see below](#documentation) for the address) including the following text and a list of co-contributors (if any): *I agree to contribute to the URBANopt SDK. I agree to the following terms and conditions for my contributions: First, I agree that I am licensing the copyright to my contributions under the terms of the current URBANopt SDK license. Second, I hereby grant to Alliance for Sustainable Energy, LLC, to any successor manager and distributor of URBANopt SDK appointed by the U.S. Department of Energy, and to all recipients of a version of URBANopt SDK that includes my contributions, a non-exclusive, worldwide, royalty-free, irrevocable patent license under any patent claims owned by me, or owned by my employer and known to me, that are or will be,necessarily infringed upon by my contributions alone, or by combination of my contributions with the version of URBANopt SDK to which they are contributed, to make, have made, use, offer to sell, sell, import, and otherwise transfer any version of URBANopt SDK that includes my contributions, in source code and object code form. Third, I represent and warrant that I am authorized to make the contributions and grant the foregoing license(s). Additionally, if, to my knowledge, my employer has rights to intellectual property that covers my contributions, I represent and warrant that I have received permission to make these contributions and grant the foregoing license(s) on behalf of my employer.* @@ -16,7 +16,7 @@ Once we have your consent on file, you’ll only need to redo it if conditions c ## 2. Scope agreement and timeline commitment -If your contribution is small (e.g. a bug fix), simply submit your contribution via GitHub. If you find a bug, first make sure it is not an already known issue, then report it in the GitHub [issue tracker](https://github.com/urbanopt/urbanopt-scenario-gem/issues) for this repository. If your contribution is larger (e.g. a new feature or new functionality/capability), we’ll need to evaluate your proposed contribution first. We may ask you to revise your materials and make changes to it, which we will then re-review. +If your contribution is small (e.g. a bug fix), simply submit your contribution via GitHub. If you find a bug, first make sure it is not an already known issue, then report it in the GitHub [issue tracker](https://github.com/urbanopt/urbanopt-geojson-gem/issues) for this repository. If your contribution is larger (e.g. a new feature or new functionality/capability), we’ll need to evaluate your proposed contribution first. We may ask you to revise your materials and make changes to it, which we will then re-review. ## 3. Technical contribution process From 0d3eb2bfcd2533ee3c0e5fd317d5bea2754ce1dd Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Thu, 21 Dec 2023 13:14:38 -0700 Subject: [PATCH 08/10] include 2024 in license --- doc_templates/LICENSE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc_templates/LICENSE.md b/doc_templates/LICENSE.md index ff1cffc..30c4553 100644 --- a/doc_templates/LICENSE.md +++ b/doc_templates/LICENSE.md @@ -1,4 +1,4 @@ -URBANopt (tm), Copyright (c) 2019-2023, Alliance for Sustainable Energy, LLC, and other +URBANopt (tm), Copyright (c) 2019-2024, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved. Redistribution and use in source and binary forms, with or without modification, From c3911eec53725df11e89ffb36279ce4e910d701d Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Mon, 8 Jan 2024 16:13:30 -0700 Subject: [PATCH 09/10] bump json-schema minor version --- urbanopt-geojson-gem.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/urbanopt-geojson-gem.gemspec b/urbanopt-geojson-gem.gemspec index 961431b..1a591ed 100644 --- a/urbanopt-geojson-gem.gemspec +++ b/urbanopt-geojson-gem.gemspec @@ -30,6 +30,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 'json-schema', '~> 2.7' + spec.add_runtime_dependency 'json-schema', '~> 2.8' spec.add_runtime_dependency 'urbanopt-core', '~> 0.11.0' end From 7b3dfdfa667116542ab73ccafe31dcf9504b74ad Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Mon, 8 Jan 2024 16:17:25 -0700 Subject: [PATCH 10/10] set safe dir in CI runner to eliminate nag message --- .github/workflows/nightly_build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/nightly_build.yml b/.github/workflows/nightly_build.yml index cafd4ce..dfc857f 100644 --- a/.github/workflows/nightly_build.yml +++ b/.github/workflows/nightly_build.yml @@ -21,6 +21,10 @@ jobs: image: docker://nrel/openstudio:3.7.0 steps: - uses: actions/checkout@v4 + - name: set git config options + shell: bash + run: | + git config --global --add safe.directory '*' - name: Update gems run: | ruby --version