Merge pull request #51 from NREL/develop

version 0.7.0
NREL · Nov 30, 2022 · e0d633f · e0d633f
2 parents b505a83 + ce9e220
commit e0d633f
Show file tree

Hide file tree

Showing 132 changed files with 351 additions and 340 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # OpenStudio Calibration Measures Gem
 
+## Version 0.7.0
+* Support for OpenStudio 3.5 (upgrade to standards gem 0.3.0, extension gem 0.6.0)
+
 ## Version 0.6.0
 * Support for OpenStudio 3.4 (upgrade to standards gem 0.2.16, no extension gem upgrade)
 

diff --git a/Gemfile b/Gemfile
@@ -10,11 +10,6 @@ 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'

diff --git a/LICENSE.md b/LICENSE.md
@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
+OpenStudio(R), Copyright (c) 2008-2022, 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/README.md b/README.md
@@ -24,6 +24,7 @@ Or install it yourself as:
 
 |OpenStudio Calibration Gem|OpenStudio|Ruby|
 |:--------------:|:----------:|:--------:|
+| 0.7.0  | 3.5      | 2.7    |
 | 0.6.0  | 3.4      | 2.7    |
 | 0.5.0  | 3.3      | 2.7    |
 | 0.4.0 - 0.4.2  | 3.2      | 2.7    |

diff --git a/doc_templates/LICENSE.md b/doc_templates/LICENSE.md
@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
+OpenStudio(R), Copyright (c) 2008-2022, 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-2021, Alliance for Sustainable Energy, LLC.
+  # OpenStudio(R), Copyright (c) 2008-2022, 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-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
+ * OpenStudio(R), Copyright (c) 2008-2022, 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-2021, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2022, 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/AddMonthlyJSONUtilityData/LICENSE.md b/lib/measures/AddMonthlyJSONUtilityData/LICENSE.md
@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
+OpenStudio(R), Copyright (c) 2008-2022, 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/AddMonthlyJSONUtilityData/measure.rb b/lib/measures/AddMonthlyJSONUtilityData/measure.rb
@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2022, 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/AddMonthlyJSONUtilityData/measure.xml b/lib/measures/AddMonthlyJSONUtilityData/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>add_monthly_json_utility_data</name>
   <uid>6da969e0-4256-49bf-9607-26504cc3d423</uid>
-  <version_id>48f42dbe-b5ca-4e20-a3ea-73348f118371</version_id>
-  <version_modified>20210304T152732Z</version_modified>
+  <version_id>706776f7-efa4-4aa4-9733-96f4e64033fe</version_id>
+  <version_modified>20221115T231440Z</version_modified>
   <xml_checksum>057E8D9D</xml_checksum>
   <class_name>AddMonthlyJSONUtilityData</class_name>
   <display_name>Add Monthly JSON Utility Data</display_name>
@@ -147,7 +147,7 @@
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>A21A3ED2</checksum>
+      <checksum>64FFEBDE</checksum>
     </file>
     <file>
       <version>
@@ -158,7 +158,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>7B1E00EA</checksum>
+      <checksum>7C40B2C4</checksum>
     </file>
   </files>
 </measure>
diff --git a/lib/measures/AddMonthlyUtilityData/LICENSE.md b/lib/measures/AddMonthlyUtilityData/LICENSE.md
@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
+OpenStudio(R), Copyright (c) 2008-2022, 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/AddMonthlyUtilityData/measure.rb b/lib/measures/AddMonthlyUtilityData/measure.rb
@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2022, 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/AddMonthlyUtilityData/measure.xml b/lib/measures/AddMonthlyUtilityData/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>add_monthly_utility_data</name>
   <uid>6da969e0-4256-49bf-9607-26504cc3d421</uid>
-  <version_id>b37794e0-1d11-446a-be95-e565bdcc6e3f</version_id>
-  <version_modified>20210304T152732Z</version_modified>
+  <version_id>43b0307c-9c85-447a-81b6-16266eed28ac</version_id>
+  <version_modified>20221115T231442Z</version_modified>
   <xml_checksum>9064277D</xml_checksum>
   <class_name>AddMonthlyUtilityData</class_name>
   <display_name>AddMonthlyUtilityData</display_name>
@@ -93,7 +93,7 @@
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>A21A3ED2</checksum>
+      <checksum>64FFEBDE</checksum>
     </file>
     <file>
       <version>
@@ -104,13 +104,13 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>15DA7891</checksum>
+      <checksum>A42CC52D</checksum>
     </file>
     <file>
       <filename>AddMonthlyUtilityData_Test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>656036ED</checksum>
+      <checksum>A837B4BF</checksum>
     </file>
   </files>
 </measure>
diff --git a/lib/measures/AddMonthlyUtilityData/tests/AddMonthlyUtilityData_Test.rb b/lib/measures/AddMonthlyUtilityData/tests/AddMonthlyUtilityData_Test.rb
@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2022, 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/CalibrationReports/LICENSE.md b/lib/measures/CalibrationReports/LICENSE.md
@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
+OpenStudio(R), Copyright (c) 2008-2022, 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/CalibrationReports/measure.rb b/lib/measures/CalibrationReports/measure.rb
@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2022, 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/CalibrationReports/measure.xml b/lib/measures/CalibrationReports/measure.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <measure>
   <schema_version>3.0</schema_version>
+  <error>wrong number of arguments (given 1, expected 0)</error>
   <name>calibration_reports</name>
   <uid>2baede0a-65f3-47ec-b5f6-9c21d0f91aff</uid>
-  <version_id>63aaeb4e-fd54-483b-92f4-7a5d893986bd</version_id>
-  <version_modified>20210304T152733Z</version_modified>
+  <version_id>786caf56-316e-40a9-9cce-9775573abcbb</version_id>
+  <version_modified>20221115T231448Z</version_modified>
   <xml_checksum>2C8A3EEF</xml_checksum>
   <class_name>CalibrationReports</class_name>
   <display_name>Calibration Reports</display_name>
@@ -65,11 +66,17 @@
       <usage_type>test</usage_type>
       <checksum>9A565F93</checksum>
     </file>
+    <file>
+      <filename>README.md</filename>
+      <filetype>md</filetype>
+      <usage_type>readme</usage_type>
+      <checksum>0B68E96D</checksum>
+    </file>
     <file>
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>A21A3ED2</checksum>
+      <checksum>64FFEBDE</checksum>
     </file>
     <file>
       <version>
@@ -80,19 +87,13 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>EAEA784A</checksum>
+      <checksum>87DF6D82</checksum>
     </file>
     <file>
       <filename>CalibrationReports_Test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>C4F25697</checksum>
-    </file>
-    <file>
-      <filename>README.md</filename>
-      <filetype>md</filetype>
-      <usage_type>readme</usage_type>
-      <checksum>0B68E96D</checksum>
+      <checksum>86F1937B</checksum>
     </file>
   </files>
 </measure>
diff --git a/lib/measures/CalibrationReports/tests/CalibrationReports_Test.rb b/lib/measures/CalibrationReports/tests/CalibrationReports_Test.rb
@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2022, 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/CalibrationReportsEnhanced/LICENSE.md b/lib/measures/CalibrationReportsEnhanced/LICENSE.md
@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
+OpenStudio(R), Copyright (c) 2008-2022, 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/CalibrationReportsEnhanced/measure.rb b/lib/measures/CalibrationReportsEnhanced/measure.rb
@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2022, 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/CalibrationReportsEnhanced/measure.xml b/lib/measures/CalibrationReportsEnhanced/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>calibration_reports_enhanced</name>
   <uid>e6642d40-7366-4647-8724-53a37991d668</uid>
-  <version_id>598e91d5-6305-4fdf-a9c8-68ceb47daab0</version_id>
-  <version_modified>20210305T012911Z</version_modified>
+  <version_id>96f837a8-f6af-4c34-84fc-c26b2ec2feba</version_id>
+  <version_modified>20221115T231440Z</version_modified>
   <xml_checksum>2C8A3EEF</xml_checksum>
   <class_name>CalibrationReportsEnhanced</class_name>
   <display_name>Calibration Reports Enhanced</display_name>
@@ -340,17 +340,23 @@
       <usage_type>readmeerb</usage_type>
       <checksum>703C9964</checksum>
     </file>
+    <file>
+      <filename>README.md</filename>
+      <filetype>md</filetype>
+      <usage_type>readme</usage_type>
+      <checksum>9073A0CD</checksum>
+    </file>
     <file>
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>A21A3ED2</checksum>
+      <checksum>64FFEBDE</checksum>
     </file>
     <file>
       <filename>CalibrationReportsEnhanced_Test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>600F96BA</checksum>
+      <checksum>B3C08DB0</checksum>
     </file>
     <file>
       <version>
@@ -361,13 +367,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>5EC0C6F3</checksum>
-    </file>
-    <file>
-      <filename>README.md</filename>
-      <filetype>md</filetype>
-      <usage_type>readme</usage_type>
-      <checksum>9073A0CD</checksum>
+      <checksum>2C8AB340</checksum>
     </file>
   </files>
 </measure>
diff --git a/lib/measures/CalibrationReportsEnhanced/tests/CalibrationReportsEnhanced_Test.rb b/lib/measures/CalibrationReportsEnhanced/tests/CalibrationReportsEnhanced_Test.rb
@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2022, 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/CoilCoolingDXSingleSpeedMultiplier/LICENSE.md b/lib/measures/CoilCoolingDXSingleSpeedMultiplier/LICENSE.md
@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
+OpenStudio(R), Copyright (c) 2008-2022, 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/CoilCoolingDXSingleSpeedMultiplier/measure.rb b/lib/measures/CoilCoolingDXSingleSpeedMultiplier/measure.rb
@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2022, 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/CoilCoolingDXSingleSpeedMultiplier/measure.xml b/lib/measures/CoilCoolingDXSingleSpeedMultiplier/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>coil_cooling_dx_single_speed_multiplier</name>
   <uid>97d0dbdf-6245-4cfd-8dfc-a6a5eb853b16</uid>
-  <version_id>4a428d9f-5f11-4a16-96ea-13d037c7a008</version_id>
-  <version_modified>20210304T152733Z</version_modified>
+  <version_id>65e72e4a-37de-4ed1-9614-eb7d21db41c8</version_id>
+  <version_modified>20221115T231447Z</version_modified>
   <xml_checksum>8CBDDA1B</xml_checksum>
   <class_name>CoilCoolingDXSingleSpeedMultiplier</class_name>
   <display_name>Cooling Coils DX Single Speed Multiplier</display_name>
@@ -17,10 +17,10 @@
       <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>{97f0a390-16f6-42d5-a754-4e43e3640cbf}</default_value>
+      <default_value>{326cf842-2a1c-4676-b14d-94a91aff5221}</default_value>
       <choices>
         <choice>
-          <value>{97f0a390-16f6-42d5-a754-4e43e3640cbf}</value>
+          <value>{326cf842-2a1c-4676-b14d-94a91aff5221}</value>
           <display_name>*All DX Cooling Coils*</display_name>
         </choice>
         <choice>
@@ -77,7 +77,7 @@
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>A21A3ED2</checksum>
+      <checksum>64FFEBDE</checksum>
     </file>
     <file>
       <version>
@@ -88,7 +88,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>86AB2AD3</checksum>
+      <checksum>A16270E9</checksum>
     </file>
   </files>
 </measure>
diff --git a/lib/measures/CoilCoolingDXSingleSpeedPercentChange/LICENSE.md b/lib/measures/CoilCoolingDXSingleSpeedPercentChange/LICENSE.md
@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
+OpenStudio(R), Copyright (c) 2008-2022, 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/CoilCoolingDXSingleSpeedPercentChange/measure.rb b/lib/measures/CoilCoolingDXSingleSpeedPercentChange/measure.rb
@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2022, 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: