Merge pull request #30 from NREL/develop

Prep release for 0.4.0
NREL · Apr 23, 2021 · db2f2a4 · db2f2a4
2 parents 2cee82f + 08a9e84
commit db2f2a4
Show file tree

Hide file tree

Showing 110 changed files with 262 additions and 246 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # OpenStudio EE Gem
 
+## Version 0.4.0
+
+* Support Ruby ~> 2.7
+* Support for OpenStudio 3.2 (upgrade to extension gem 0.4.2 and standards gem 0.2.13)
+
 ## Version 0.3.2
 
 * Bump openstudio-extension-gem version to 0.3.2 to support updated workflow-gem

diff --git a/Gemfile b/Gemfile
@@ -12,6 +12,12 @@ gemspec
 # checkout the latest version (develop) from github.
 allow_local = ENV['FAVOR_LOCAL_GEMS']
 
+# uncomment when you want CI to use develop branch of extension gem
+# gem 'openstudio-extension', github: 'NREL/OpenStudio-extension-gem', branch: 'develop'
+
+# uncomment when you want CI to use develop branch of openstudio-standards gem
+# gem 'openstudio-standards', github: 'NREL/OpenStudio-standards', branch: 'master'
+
 if allow_local && File.exist?('../OpenStudio-extension-gem')
   gem 'openstudio-extension', path: '../OpenStudio-extension-gem'
 elsif allow_local

diff --git a/LICENSE.md b/LICENSE.md
@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
+OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted 
 provided that the following conditions are met:

diff --git a/Rakefile b/Rakefile
@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

diff --git a/doc_templates/LICENSE.md b/doc_templates/LICENSE.md
@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
+OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted 
 provided that the following conditions are met:

diff --git a/doc_templates/copyright_erb.txt b/doc_templates/copyright_erb.txt
@@ -1,6 +1,6 @@
 <%
   # *******************************************************************************
-  # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+  # OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
   # All rights reserved.
   # Redistribution and use in source and binary forms, with or without
   # modification, are permitted provided that the following conditions are met:

diff --git a/doc_templates/copyright_js.txt b/doc_templates/copyright_js.txt
@@ -1,4 +1,4 @@
 /* @preserve
- * OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
+ * OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be found at openstudio.net/license.
 */
diff --git a/doc_templates/copyright_ruby.txt b/doc_templates/copyright_ruby.txt
@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

diff --git a/lib/measures/AddDaylightSensors/LICENSE.md b/lib/measures/AddDaylightSensors/LICENSE.md
@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
+OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted 
 provided that the following conditions are met:

diff --git a/lib/measures/AddDaylightSensors/measure.rb b/lib/measures/AddDaylightSensors/measure.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

diff --git a/lib/measures/AddDaylightSensors/measure.xml b/lib/measures/AddDaylightSensors/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>add_daylight_sensors</name>
   <uid>62babdc7-c81e-4dfd-96e8-af1628a55167</uid>
-  <version_id>4cb39c28-b1c9-4a77-a1cc-06304e73cb41</version_id>
-  <version_modified>20200316T215554Z</version_modified>
+  <version_id>81ebd731-7cf6-4f7a-a07a-25a99d42ce53</version_id>
+  <version_modified>20210423T161941Z</version_modified>
   <xml_checksum>0AC58119</xml_checksum>
   <class_name>AddDaylightSensors</class_name>
   <display_name>Add Daylight Sensor at the Center of Spaces with a Specified Space Type Assigned</display_name>
@@ -211,7 +211,7 @@
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>E0468DD6</checksum>
+      <checksum>A21A3ED2</checksum>
     </file>
     <file>
       <version>
@@ -222,13 +222,13 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>6265A583</checksum>
+      <checksum>D887DC57</checksum>
     </file>
     <file>
       <filename>AddDaylightSensors_Test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>4298E1F6</checksum>
+      <checksum>AFBE30AE</checksum>
     </file>
   </files>
 </measure>
diff --git a/lib/measures/AddDaylightSensors/tests/AddDaylightSensors_Test.rb b/lib/measures/AddDaylightSensors/tests/AddDaylightSensors_Test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

diff --git a/lib/measures/AddOverhangsByProjectionFactor/LICENSE.md b/lib/measures/AddOverhangsByProjectionFactor/LICENSE.md
@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
+OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted 
 provided that the following conditions are met:

diff --git a/lib/measures/AddOverhangsByProjectionFactor/measure.rb b/lib/measures/AddOverhangsByProjectionFactor/measure.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

diff --git a/lib/measures/AddOverhangsByProjectionFactor/measure.xml b/lib/measures/AddOverhangsByProjectionFactor/measure.xml
@@ -1,9 +1,10 @@
+<?xml version="1.0"?>
 <measure>
   <schema_version>3.0</schema_version>
   <name>add_overhangs_by_projection_factor</name>
   <uid>1e29e117-3916-4368-b24d-75da54045956</uid>
-  <version_id>f128deed-eaa4-40fe-8dab-bfd2775a1743</version_id>
-  <version_modified>20200325T031059Z</version_modified>
+  <version_id>aa2afdfd-a9a2-499e-91c7-00d742dcc20c</version_id>
+  <version_modified>20210423T161941Z</version_modified>
   <xml_checksum>6DE831F7</xml_checksum>
   <class_name>AddOverhangsByProjectionFactor</class_name>
   <display_name>Add Overhangs by Projection Factor</display_name>
@@ -71,8 +72,8 @@
       <model_dependent>false</model_dependent>
     </argument>
   </arguments>
-  <outputs/>
-  <provenances/>
+  <outputs />
+  <provenances />
   <tags>
     <tag>Envelope.Fenestration</tag>
   </tags>
@@ -121,7 +122,7 @@
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>E0468DD6</checksum>
+      <checksum>A21A3ED2</checksum>
     </file>
     <file>
       <version>
@@ -132,13 +133,13 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>F171A410</checksum>
+      <checksum>4481FEE3</checksum>
     </file>
     <file>
       <filename>AddOverhangsByProjectionFactor_Test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>1247729F</checksum>
+      <checksum>992455A5</checksum>
     </file>
   </files>
 </measure>
diff --git a/lib/measures/AddOverhangsByProjectionFactor/tests/AddOverhangsByProjectionFactor_Test.rb b/lib/measures/AddOverhangsByProjectionFactor/tests/AddOverhangsByProjectionFactor_Test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

diff --git a/lib/measures/EnableDemandControlledVentilation/LICENSE.md b/lib/measures/EnableDemandControlledVentilation/LICENSE.md
@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
+OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted 
 provided that the following conditions are met:

diff --git a/lib/measures/EnableDemandControlledVentilation/measure.rb b/lib/measures/EnableDemandControlledVentilation/measure.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

diff --git a/lib/measures/EnableDemandControlledVentilation/measure.xml b/lib/measures/EnableDemandControlledVentilation/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>enable_demand_controlled_ventilation</name>
   <uid>3ff4b412-8689-4b11-a588-935c621dc97d</uid>
-  <version_id>c40cd373-fb86-47c8-91ab-c4506345ab99</version_id>
-  <version_modified>20200316T215553Z</version_modified>
+  <version_id>3b270b50-ce1b-48ea-bf84-b16e2d8ac857</version_id>
+  <version_modified>20210423T161942Z</version_modified>
   <xml_checksum>ECE70A70</xml_checksum>
   <class_name>EnableDemandControlledVentilation</class_name>
   <display_name>Enable Demand Controlled Ventilation</display_name>
@@ -97,7 +97,7 @@ The cost arguments are user arguments that start with a default of $0.</modeler_
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>E0468DD6</checksum>
+      <checksum>A21A3ED2</checksum>
     </file>
     <file>
       <version>
@@ -108,13 +108,13 @@ The cost arguments are user arguments that start with a default of $0.</modeler_
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>D051868A</checksum>
+      <checksum>EB09CF2A</checksum>
     </file>
     <file>
       <filename>EnableDemandControlledVentilation_Test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>12A588F9</checksum>
+      <checksum>3AD85053</checksum>
     </file>
   </files>
 </measure>
diff --git a/...easures/EnableDemandControlledVentilation/tests/EnableDemandControlledVentilation_Test.rb b/...easures/EnableDemandControlledVentilation/tests/EnableDemandControlledVentilation_Test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

diff --git a/lib/measures/EnableEconomizerControl/LICENSE.md b/lib/measures/EnableEconomizerControl/LICENSE.md
@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
+OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted 
 provided that the following conditions are met:

diff --git a/lib/measures/EnableEconomizerControl/measure.rb b/lib/measures/EnableEconomizerControl/measure.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

diff --git a/lib/measures/EnableEconomizerControl/measure.xml b/lib/measures/EnableEconomizerControl/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>enable_economizer_control</name>
   <uid>f8cc920d-8ae3-411a-922f-e6fed3223c4d</uid>
-  <version_id>fd6ffeff-a00b-4a6d-9c13-0e04dd7dd70f</version_id>
-  <version_modified>20200316T215553Z</version_modified>
+  <version_id>ebeb626e-1040-44a2-a180-cddf660cf7d0</version_id>
+  <version_modified>20210423T161942Z</version_modified>
   <xml_checksum>ECE70A70</xml_checksum>
   <class_name>EnableEconomizerControl</class_name>
   <display_name>Enable Economizer Control</display_name>
@@ -154,7 +154,7 @@ The cost arguments are user arguments that start with a default of $0.
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>E0468DD6</checksum>
+      <checksum>A21A3ED2</checksum>
     </file>
     <file>
       <version>
@@ -165,13 +165,13 @@ The cost arguments are user arguments that start with a default of $0.
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>73FC90AD</checksum>
+      <checksum>F5A5B16C</checksum>
     </file>
     <file>
       <filename>measure_Test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>E5072CB7</checksum>
+      <checksum>08FB3A6E</checksum>
     </file>
   </files>
 </measure>
diff --git a/lib/measures/EnableEconomizerControl/tests/measure_Test.rb b/lib/measures/EnableEconomizerControl/tests/measure_Test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

diff --git a/lib/measures/GLHEProExportLoadsforGroundHeatExchangerSizing/LICENSE.md b/lib/measures/GLHEProExportLoadsforGroundHeatExchangerSizing/LICENSE.md
@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
+OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted 
 provided that the following conditions are met:

diff --git a/lib/measures/GLHEProExportLoadsforGroundHeatExchangerSizing/measure.rb b/lib/measures/GLHEProExportLoadsforGroundHeatExchangerSizing/measure.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

diff --git a/lib/measures/GLHEProExportLoadsforGroundHeatExchangerSizing/measure.xml b/lib/measures/GLHEProExportLoadsforGroundHeatExchangerSizing/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>glhe_pro_export_loadsfor_ground_heat_exchanger_sizing</name>
   <uid>7bb0ce67-cffb-4ef6-b7fb-093c7c43e263</uid>
-  <version_id>ba9023aa-374a-4a78-9c7d-09cbd752e093</version_id>
-  <version_modified>20200714T172140Z</version_modified>
+  <version_id>fdd78344-2bb4-416c-abc6-50dbfec0d4f1</version_id>
+  <version_modified>20210423T161943Z</version_modified>
   <xml_checksum>2C8A3EEF</xml_checksum>
   <class_name>GLHEProExportLoadsforGroundHeatExchangerSizing</class_name>
   <display_name>GLHEProExportLoadsforGroundHeatExchangerSizing</display_name>
@@ -137,23 +137,29 @@
       <usage_type>doc</usage_type>
       <checksum>B2BD6A64</checksum>
     </file>
-    <file>
-      <filename>LICENSE.md</filename>
-      <filetype>md</filetype>
-      <usage_type>license</usage_type>
-      <checksum>E0468DD6</checksum>
-    </file>
     <file>
       <filename>README.md.erb</filename>
       <filetype>erb</filetype>
       <usage_type>readmeerb</usage_type>
       <checksum>703C9964</checksum>
     </file>
+    <file>
+      <filename>README.md</filename>
+      <filetype>md</filetype>
+      <usage_type>readme</usage_type>
+      <checksum>CA89050A</checksum>
+    </file>
+    <file>
+      <filename>LICENSE.md</filename>
+      <filetype>md</filetype>
+      <usage_type>license</usage_type>
+      <checksum>A21A3ED2</checksum>
+    </file>
     <file>
       <filename>GLHEProExportLoadsforGroundHeatExchangerSizing_Test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>EB40F738</checksum>
+      <checksum>0AB56C4A</checksum>
     </file>
     <file>
       <version>
@@ -164,13 +170,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>496F92E3</checksum>
-    </file>
-    <file>
-      <filename>README.md</filename>
-      <filetype>md</filetype>
-      <usage_type>readme</usage_type>
-      <checksum>0B68E96D</checksum>
+      <checksum>8A852CDA</checksum>
     </file>
   </files>
 </measure>