From f5b85e2a91ef2ff714a30fbb2951dfd99f74eb20 Mon Sep 17 00:00:00 2001 From: Rajendra Adhikari Date: Tue, 2 Jan 2024 09:27:31 -0700 Subject: [PATCH 1/4] handle empty json --- buildstockbatch/postprocessing.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/buildstockbatch/postprocessing.py b/buildstockbatch/postprocessing.py index 5da97db0..f57794cc 100644 --- a/buildstockbatch/postprocessing.py +++ b/buildstockbatch/postprocessing.py @@ -42,6 +42,8 @@ def read_data_point_out_json(fs, reporting_measures, filename): try: with fs.open(filename, "r") as f: d = json.load(f) + if not d: + return None except (FileNotFoundError, json.JSONDecodeError): return None else: From 0f1e60771a2ddd9b0d10a0a845a173b083e41818 Mon Sep 17 00:00:00 2001 From: Rajendra Adhikari Date: Tue, 2 Jan 2024 09:39:06 -0700 Subject: [PATCH 2/4] Update changelog --- docs/changelog/changelog_dev.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/changelog/changelog_dev.rst b/docs/changelog/changelog_dev.rst index 988c51e2..bde25418 100644 --- a/docs/changelog/changelog_dev.rst +++ b/docs/changelog/changelog_dev.rst @@ -20,3 +20,9 @@ Development Changelog :pullreq: 422 Refactor AWS code so it can be shared by the upcoming GCP implementation. + + .. change:: + :tags: general, bugfix + :pullreq: 426 + + A bugfix for gracefully handling empty data_point_out.json files. \ No newline at end of file From 61992f629fc784080febe34a64f00adac8e80a40 Mon Sep 17 00:00:00 2001 From: Noel Merket Date: Tue, 2 Jan 2024 09:59:53 -0700 Subject: [PATCH 3/4] updating ci to OpenStudio 3.7.0 final --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 22bb1da4..74520dcf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,7 @@ jobs: wget --quiet https://data.nrel.gov/system/files/156/BuildStock_TMY3_FIPS.zip - name: Download and Install OpenStudio run: | - wget -q https://github.com/NREL/OpenStudio/releases/download/v3.7.0-rc1/OpenStudio-3.7.0-rc1+211bb633b0-Ubuntu-22.04-x86_64.deb + wget -q https://github.com/NREL/OpenStudio/releases/download/v3.7.0/OpenStudio-3.7.0+d5269793f1-Ubuntu-22.04-x86_64.deb sudo apt install -y ./OpenStudio-3.7.0-rc1+211bb633b0-Ubuntu-22.04-x86_64.deb openstudio openstudio_version which openstudio From 8b4a68f5258134dafe62e6e558cffe407009c6de Mon Sep 17 00:00:00 2001 From: Noel Merket Date: Tue, 2 Jan 2024 10:18:00 -0700 Subject: [PATCH 4/4] and extracting the right file --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 74520dcf..20c5c725 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,7 +35,7 @@ jobs: - name: Download and Install OpenStudio run: | wget -q https://github.com/NREL/OpenStudio/releases/download/v3.7.0/OpenStudio-3.7.0+d5269793f1-Ubuntu-22.04-x86_64.deb - sudo apt install -y ./OpenStudio-3.7.0-rc1+211bb633b0-Ubuntu-22.04-x86_64.deb + sudo apt install -y ./OpenStudio-3.7.0+d5269793f1-Ubuntu-22.04-x86_64.deb openstudio openstudio_version which openstudio - name: Install buildstockbatch