From d19e9f7fdffe2cabf8cb6a4ef64a4982f4ddfa78 Mon Sep 17 00:00:00 2001 From: Tom Kent Date: Wed, 30 Oct 2024 20:17:28 -0500 Subject: [PATCH 1/4] Change to use the `==` comparison --- skins/JSON/current_minimal.json.tmpl | 2 +- skins/JSON/weewx.json.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/skins/JSON/current_minimal.json.tmpl b/skins/JSON/current_minimal.json.tmpl index 5f5cf2f..a69b92a 100644 --- a/skins/JSON/current_minimal.json.tmpl +++ b/skins/JSON/current_minimal.json.tmpl @@ -9,7 +9,7 @@ }, "generation": { - #if $Extras.timestamp_fmt is "human" + #if $Extras.timestamp_fmt == "human" "time": "$current.dateTime.format("%a, %d %b %Y %H:%M:%S %Z")", #else "time": "$current.dateTime.format("%Y-%m-%dT%H:%M:%S%z")", diff --git a/skins/JSON/weewx.json.tmpl b/skins/JSON/weewx.json.tmpl index 3129370..4a30d0d 100644 --- a/skins/JSON/weewx.json.tmpl +++ b/skins/JSON/weewx.json.tmpl @@ -9,7 +9,7 @@ }, "generation": { - #if $Extras.timestamp_fmt is "human" + #if $Extras.timestamp_fmt == "human" "time": "$current.dateTime.format("%a, %d %b %Y %H:%M:%S %Z")", #else "time": "$current.dateTime.format("%Y-%m-%dT%H:%M:%S%z")", From 5ff3b632c7b41526cc925c70fa92016684e312ca Mon Sep 17 00:00:00 2001 From: Tom Kent Date: Wed, 30 Oct 2024 20:19:51 -0500 Subject: [PATCH 2/4] Latest upload-artifact --- .github/workflows/package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index f9ea35b..e0abfc5 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -14,7 +14,7 @@ jobs: - name: run-build run: python3 build_package.py --set-version ${{ steps.hash.outputs.sha_short }} - name: artifact package - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: package path: dist/weewx-json_${{ steps.hash.outputs.sha_short }}.tar.gz From 8dc76947505e8778b4d01523134fc3251ddd2908 Mon Sep 17 00:00:00 2001 From: Tom Kent Date: Wed, 30 Oct 2024 20:21:11 -0500 Subject: [PATCH 3/4] Logged in changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b2372c1..4db2e31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ Upcoming -------- +* Fixed a warning due to the use of `is` comparison with a literal instead of `==` 1.2 --- From 17a0a80985fc7d2793123048a7fd09910e367246 Mon Sep 17 00:00:00 2001 From: Tom Kent Date: Wed, 30 Oct 2024 20:23:19 -0500 Subject: [PATCH 4/4] Update checkout action to v4 --- .github/workflows/package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index e0abfc5..88553a3 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -7,7 +7,7 @@ jobs: steps: - name: checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: get-hash id: hash run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"