Merge pull request #1144 from NREL/latest-os-hpxml-os370

Latest OS-HPXML, OS v3.7.0

.github/workflows/config.yml

@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [format-files]
     container:
-      image: docker://nrel/openstudio:3.6.1
+      image: docker://nrel/openstudio:develop
     steps:
       - uses: actions/checkout@v3
         with:
@@ -75,7 +75,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [unit-tests]
     container:
-      image: docker://nrel/openstudio:3.6.1
+      image: docker://nrel/openstudio:develop
     steps:
       - uses: actions/checkout@v3
         with:
@@ -137,8 +137,8 @@ jobs:
 
       - name: Download and Install OpenStudio
         run: |
-          wget -q https://github.com/NREL/OpenStudio/releases/download/v3.6.1/OpenStudio-3.6.1+bb9481519e-Ubuntu-20.04-x86_64.deb
-          sudo apt install -y ./OpenStudio-3.6.1+bb9481519e-Ubuntu-20.04-x86_64.deb
+          wget -q https://github.com/NREL/OpenStudio/releases/download/v3.7.0-rc1/OpenStudio-3.7.0-rc1+211bb633b0-Ubuntu-20.04-x86_64.deb
+          sudo apt install -y ./OpenStudio-3.7.0-rc1+211bb633b0-Ubuntu-20.04-x86_64.deb
           openstudio openstudio_version
           which openstudio
 

CHANGELOG.md

@@ -10,6 +10,7 @@ Features
 - Add Water Heater Location and Geometry Space Combination, update Geometry Garage and Geometry Floor Area Bin to RECS2020, update RECS2020 microdata from v2 to v4, auto-generate buildstocks for yml_precomputed tests ([#1125](https://github.com/NREL/resstock/pull/1125))
 - Add ability to request timeseries resilience output from the yml file ([#1113](https://github.com/NREL/resstock/pull/1113))
 - Add ability to calculate detailed utility bills based on a user-specified TSV file of paths to JSON utility rate tariff files ([#1109](https://github.com/NREL/resstock/pull/1109))
+- Update to OpenStudio v3.7.0 ([#1144](https://github.com/NREL/resstock/pull/1144))
 
 Fixes
 - Set standard format for options_lookup ([#962](https://github.com/NREL/resstock/pull/962))

project_national/national_baseline.yml

@@ -1,6 +1,6 @@
 schema_version: '0.3'
-os_version: 3.6.1
-os_sha: bb9481519e
+os_version: '3.7.0-rc1'
+os_sha: 211bb633b0
 buildstock_directory: ../ # Relative to this file or absolute
 project_directory: project_national # Relative to buildstock_directory
 output_directory: national_baseline

project_national/national_upgrades.yml

@@ -1,6 +1,6 @@
 schema_version: '0.3'
-os_version: 3.6.1
-os_sha: bb9481519e
+os_version: '3.7.0-rc1'
+os_sha: 211bb633b0
 buildstock_directory: ../ # Relative to this file or absolute
 project_directory: project_national # Relative to buildstock_directory
 output_directory: national_upgrades

project_testing/testing_baseline.yml

@@ -1,6 +1,6 @@
 schema_version: '0.3'
-os_version: 3.6.1
-os_sha: bb9481519e
+os_version: '3.7.0-rc1'
+os_sha: 211bb633b0
 buildstock_directory: ../ # Relative to this file or absolute
 project_directory: project_testing # Relative to buildstock_directory
 output_directory: testing_baseline

project_testing/testing_upgrades.yml

@@ -1,6 +1,6 @@
 schema_version: '0.3'
-os_version: 3.6.1
-os_sha: bb9481519e
+os_version: '3.7.0-rc1'
+os_sha: 211bb633b0
 buildstock_directory: ../ # Relative to this file or absolute
 project_directory: project_testing # Relative to buildstock_directory
 output_directory: testing_upgrades

resources/hpxml-measures/.github/workflows/config.yml

@@ -11,7 +11,7 @@ jobs:
   run-unit-tests:
     runs-on: ubuntu-latest
     container:
-      image: docker://nrel/openstudio:3.6.1
+      image: docker://nrel/openstudio:develop
     steps:
       - uses: actions/checkout@v3
         with:
@@ -43,6 +43,12 @@ jobs:
           path: coverage
           name: coverage
 
+      - name: Store results
+        uses: actions/upload-artifact@v3
+        with:
+          path: workflow/tests/results
+          name: results
+
       - name: Build documentation
         run: |
           cd docs
@@ -57,7 +63,7 @@ jobs:
   run-workflow-tests:
     runs-on: ubuntu-latest
     container:
-      image: docker://nrel/openstudio:3.6.1
+      image: docker://nrel/openstudio:develop
     steps:
       - uses: actions/checkout@v3
         with:
@@ -86,16 +92,16 @@ jobs:
       - name: Install software and run test
         shell: pwsh
         run: |
-          $env:OS_VERSION="3.6.1"
-          $env:OS_SHA="bb9481519e"
+          $env:OS_VERSION="3.7.0-rc1"
+          $env:OS_SHA="211bb633b0"
           Invoke-WebRequest -OutFile Windows.tar.gz -URI "https://github.com/NREL/OpenStudio/releases/download/v${env:OS_VERSION}/OpenStudio-${env:OS_VERSION}+${env:OS_SHA}-Windows.tar.gz"
           tar -xzf Windows.tar.gz
           & .\OpenStudio-${env:OS_VERSION}+${env:OS_SHA}-Windows\bin\openstudio.exe workflow\run_simulation.rb -x workflow\sample_files\base.xml --hourly ALL --add-component-loads --add-stochastic-schedules
 
   compare-results:
     if: github.event_name == 'pull_request'
     runs-on: ubuntu-latest
-    needs: [run-workflow-tests]
+    needs: [run-workflow-tests, run-unit-tests]
     steps:
       - uses: actions/checkout@v3
         with:
@@ -147,7 +153,7 @@ jobs:
 
   update-results:
     runs-on: ubuntu-latest
-    needs: [run-workflow-tests]
+    needs: [run-workflow-tests, run-unit-tests]
     steps:
       - uses: actions/checkout@v3
         with:

resources/hpxml-measures/.readthedocs.yml

@@ -4,6 +4,10 @@ sphinx:
   configuration: docs/source/conf.py
 
 build:
-  os: ubuntu-22.04
+  os: "ubuntu-22.04"
   tools:
-    python: "3.8"
+    python: "3.11"
+
+python:
+  install:
+    - requirements: docs/requirements.txt