mirror/weewx
1
0
Fork 0
mirror of https://github.com/weewx/weewx.git synced 2026-05-18 23:05:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

V4.6.0b4

Browse Source
This commit is contained in:
Tom Keffer
2021-10-11 17:17:37 -07:00
parent f44e70a532
commit cd99ddb70d
11 changed files with 50 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/weecfg/tests/expected/weewx43_user_expected.conf
View File

@@ -26,7 +26,7 @@ log_failure = True
socket_timeout = 20
# Do not modify this - it is used by setup.py when installing and updating.
version = 4.6.0b3
version = 4.6.0b4
##############################################################################

2
bin/weewx/__init__.py
View File

@@ -7,7 +7,7 @@
from __future__ import absolute_import
import time
__version__="4.6.0b3"
__version__="4.6.0b4"
# Holds the program launch time in unix epoch seconds:
# Useful for calculating 'uptime.'

31
bin/weewx/tests/expected/StandardTest/metric/series.html
View File

@@ -15,20 +15,17 @@
<body>
<h2>Unaggregated series </h2>
<p>Unaggregated series in json: $day.outTemp.series.json():</p>
<pre>[[1283497200, 1283499000, 8.241909444444444], [1283499000, 1283500800, 7.142170555555556], [1283500800, 1283502600, 6.176861666666665], [1283502600, 1283504400, null], [1283504400, 1283506200, 4.712538333333332], [1283506200, 1283508000, 4.238339444444444], [1283508000, 1283509800, 3.947775555555554], [1283509800, 1283511600, 3.8456972222222223], [1283511600, 1283513400, 3.9337322222222206], [1283513400, 1283515200, 4.210253888888889], [1283515200, 1283517000, 4.670409999999999], [1283517000, 1283518800, 5.30620777777778], [1283518800, 1283520600, 6.106647222222223], [1283520600, 1283522400, 7.057913888888889], [1283522400, 1283524200, 8.143609444444444], [1283524200, 1283526000, 9.345038333333333], [1283526000, 1283527800, 10.641522777777778], [1283527800, 1283529600, 12.010760000000001], [1283529600, 1283531400, 13.429200555555557], [1283531400, 1283533200, 14.872454444444445], [1283533200, 1283535000, 16.315707222222223], [1283535000, 1283536800, 17.734143888888887]]</pre>
<p>Unaggregated series in json: $day.outTemp.series.round(5).json():</p>
<pre>[[1283497200, 1283499000, 8.24191], [1283499000, 1283500800, 7.14217], [1283500800, 1283502600, 6.17686], [1283502600, 1283504400, null], [1283504400, 1283506200, 4.71254], [1283506200, 1283508000, 4.23834], [1283508000, 1283509800, 3.94778], [1283509800, 1283511600, 3.8457], [1283511600, 1283513400, 3.93373], [1283513400, 1283515200, 4.21025], [1283515200, 1283517000, 4.67041], [1283517000, 1283518800, 5.30621], [1283518800, 1283520600, 6.10665], [1283520600, 1283522400, 7.05791], [1283522400, 1283524200, 8.14361], [1283524200, 1283526000, 9.34504], [1283526000, 1283527800, 10.64152], [1283527800, 1283529600, 12.01076], [1283529600, 1283531400, 13.4292], [1283531400, 1283533200, 14.87245], [1283533200, 1283535000, 16.31571], [1283535000, 1283536800, 17.73414]]</pre>
<p>Unaggregated series, in json with just start times: $day.outTemp.series(time_series='start').json:</p>
<pre>[[1283497200, 8.241909444444444], [1283499000, 7.142170555555556], [1283500800, 6.176861666666665], [1283502600, null], [1283504400, 4.712538333333332], [1283506200, 4.238339444444444], [1283508000, 3.947775555555554], [1283509800, 3.8456972222222223], [1283511600, 3.9337322222222206], [1283513400, 4.210253888888889], [1283515200, 4.670409999999999], [1283517000, 5.30620777777778], [1283518800, 6.106647222222223], [1283520600, 7.057913888888889], [1283522400, 8.143609444444444], [1283524200, 9.345038333333333], [1283526000, 10.641522777777778], [1283527800, 12.010760000000001], [1283529600, 13.429200555555557], [1283531400, 14.872454444444445], [1283533200, 16.315707222222223], [1283535000, 17.734143888888887]]</pre>
<p>Unaggregated series, in json with just start times: $day.outTemp.series(time_series='start').round(5).json:</p>
<pre>[[1283497200, 8.24191], [1283499000, 7.14217], [1283500800, 6.17686], [1283502600, null], [1283504400, 4.71254], [1283506200, 4.23834], [1283508000, 3.94778], [1283509800, 3.8457], [1283511600, 3.93373], [1283513400, 4.21025], [1283515200, 4.67041], [1283517000, 5.30621], [1283518800, 6.10665], [1283520600, 7.05791], [1283522400, 8.14361], [1283524200, 9.34504], [1283526000, 10.64152], [1283527800, 12.01076], [1283529600, 13.4292], [1283531400, 14.87245], [1283533200, 16.31571], [1283535000, 17.73414]]</pre>
<p>Unaggregated series, in json with start times in milliseconds: $day.outTemp.series(time_series='start', time_unit='unix_epoch_ms').json:</p>
<pre>[[1283497200000, 8.241909444444444], [1283499000000, 7.142170555555556], [1283500800000, 6.176861666666665], [1283502600000, null], [1283504400000, 4.712538333333332], [1283506200000, 4.238339444444444], [1283508000000, 3.947775555555554], [1283509800000, 3.8456972222222223], [1283511600000, 3.9337322222222206], [1283513400000, 4.210253888888889], [1283515200000, 4.670409999999999], [1283517000000, 5.30620777777778], [1283518800000, 6.106647222222223], [1283520600000, 7.057913888888889], [1283522400000, 8.143609444444444], [1283524200000, 9.345038333333333], [1283526000000, 10.641522777777778], [1283527800000, 12.010760000000001], [1283529600000, 13.429200555555557], [1283531400000, 14.872454444444445], [1283533200000, 16.315707222222223], [1283535000000, 17.734143888888887]]</pre>
<p>Unaggregated series, in json with start times in milliseconds: $day.outTemp.series(time_series='start', time_unit='unix_epoch_ms').round(5).json:</p>
<pre>[[1283497200000, 8.24191], [1283499000000, 7.14217], [1283500800000, 6.17686], [1283502600000, null], [1283504400000, 4.71254], [1283506200000, 4.23834], [1283508000000, 3.94778], [1283509800000, 3.8457], [1283511600000, 3.93373], [1283513400000, 4.21025], [1283515200000, 4.67041], [1283517000000, 5.30621], [1283518800000, 6.10665], [1283520600000, 7.05791], [1283522400000, 8.14361], [1283524200000, 9.34504], [1283526000000, 10.64152], [1283527800000, 12.01076], [1283529600000, 13.4292], [1283531400000, 14.87245], [1283533200000, 16.31571], [1283535000000, 17.73414]]</pre>
<p>Unaggregated series, in json, in degrees C: $day.outTemp.series.degree_C.json</p>
<pre>[[1283497200, 1283499000, 8.241909444444444], [1283499000, 1283500800, 7.142170555555556], [1283500800, 1283502600, 6.176861666666665], [1283502600, 1283504400, null], [1283504400, 1283506200, 4.712538333333332], [1283506200, 1283508000, 4.238339444444444], [1283508000, 1283509800, 3.947775555555554], [1283509800, 1283511600, 3.8456972222222223], [1283511600, 1283513400, 3.9337322222222206], [1283513400, 1283515200, 4.210253888888889], [1283515200, 1283517000, 4.670409999999999], [1283517000, 1283518800, 5.30620777777778], [1283518800, 1283520600, 6.106647222222223], [1283520600, 1283522400, 7.057913888888889], [1283522400, 1283524200, 8.143609444444444], [1283524200, 1283526000, 9.345038333333333], [1283526000, 1283527800, 10.641522777777778], [1283527800, 1283529600, 12.010760000000001], [1283529600, 1283531400, 13.429200555555557], [1283531400, 1283533200, 14.872454444444445], [1283533200, 1283535000, 16.315707222222223], [1283535000, 1283536800, 17.734143888888887]]</pre>
<p>Unaggregated series, in json, in degrees C, rounded to 2 decimal places: $day.outTemp.series.degree_C.round(2).json</p>
<pre>[[1283497200, 1283499000, 8.24], [1283499000, 1283500800, 7.14], [1283500800, 1283502600, 6.18], [1283502600, 1283504400, null], [1283504400, 1283506200, 4.71], [1283506200, 1283508000, 4.24], [1283508000, 1283509800, 3.95], [1283509800, 1283511600, 3.85], [1283511600, 1283513400, 3.93], [1283513400, 1283515200, 4.21], [1283515200, 1283517000, 4.67], [1283517000, 1283518800, 5.31], [1283518800, 1283520600, 6.11], [1283520600, 1283522400, 7.06], [1283522400, 1283524200, 8.14], [1283524200, 1283526000, 9.35], [1283526000, 1283527800, 10.64], [1283527800, 1283529600, 12.01], [1283529600, 1283531400, 13.43], [1283531400, 1283533200, 14.87], [1283533200, 1283535000, 16.32], [1283535000, 1283536800, 17.73]]</pre>
<p>Unaggregated series, in json, in degrees C, rounded to 5 decimal places: $day.outTemp.series.degree_C.round(5).json</p>
<pre>[[1283497200, 1283499000, 8.24191], [1283499000, 1283500800, 7.14217], [1283500800, 1283502600, 6.17686], [1283502600, 1283504400, null], [1283504400, 1283506200, 4.71254], [1283506200, 1283508000, 4.23834], [1283508000, 1283509800, 3.94778], [1283509800, 1283511600, 3.8457], [1283511600, 1283513400, 3.93373], [1283513400, 1283515200, 4.21025], [1283515200, 1283517000, 4.67041], [1283517000, 1283518800, 5.30621], [1283518800, 1283520600, 6.10665], [1283520600, 1283522400, 7.05791], [1283522400, 1283524200, 8.14361], [1283524200, 1283526000, 9.34504], [1283526000, 1283527800, 10.64152], [1283527800, 1283529600, 12.01076], [1283529600, 1283531400, 13.4292], [1283531400, 1283533200, 14.87245], [1283533200, 1283535000, 16.31571], [1283535000, 1283536800, 17.73414]]</pre>
<p>Unaggregated series, as a formatted string (<em>not JSON</em>) : $day.outTemp.series:</p>
<pre>00:00, 00:30, 8.2&#176;C
@@ -117,14 +114,14 @@
<hr/>
<h2>Aggregated series</h2>
<p>Aggregated series: $month.outTemp.series(aggregate_type='max', aggregate_interval=86400).json():</p>
<pre>[[1283324400, 1283410800, 26.569901666666667], [1283410800, 1283497200, 26.23604222222222], [1283497200, 1283583600, 17.734143888888887]]</pre>
<p>Aggregated series: $month.outTemp.series(aggregate_type='max', aggregate_interval=86400).round(5).json():</p>
<pre>[[1283324400, 1283410800, 26.5699], [1283410800, 1283497200, 26.23604], [1283497200, 1283583600, 17.73414]]</pre>
<p>Using shortcut 'day': $month.outTemp.series(aggregate_type='max', aggregate_interval='day').json():</p>
<pre>[[1283324400, 1283410800, 26.569901666666667], [1283410800, 1283497200, 26.23604222222222], [1283497200, 1283583600, 17.734143888888887]]</pre>
<p>Using shortcut 'day': $month.outTemp.series(aggregate_type='max', aggregate_interval='day').round(5).json():</p>
<pre>[[1283324400, 1283410800, 26.5699], [1283410800, 1283497200, 26.23604], [1283497200, 1283583600, 17.73414]]</pre>
<p>Order by column: $month.outTemp.series(aggregate_type='max', aggregate_interval=86400).json(order_by="column"):</p>
<pre>[[1283324400, 1283410800, 1283497200], [1283410800, 1283497200, 1283583600], [26.569901666666667, 26.23604222222222, 17.734143888888887]]</pre>
<p>Order by column: $month.outTemp.series(aggregate_type='max', aggregate_interval=86400).round(5).json(order_by="column"):</p>
<pre>[[1283324400, 1283410800, 1283497200], [1283410800, 1283497200, 1283583600], [26.5699, 26.23604, 17.73414]]</pre>
<p>Aggregated series, using $jsonize():
$jsonize($zip($min.start.unix_epoch_ms.raw, $min.data.degree_C.round(2).raw, $max.data.degree_C.round(2).raw))

31
bin/weewx/tests/expected/StandardTest/series.html
View File

@@ -15,20 +15,17 @@
<body>
<h2>Unaggregated series </h2>
<p>Unaggregated series in json: $day.outTemp.series.json():</p>
<pre>[[1283497200, 1283499000, 46.835437], [1283499000, 1283500800, 44.855907], [1283500800, 1283502600, 43.118351], [1283502600, 1283504400, null], [1283504400, 1283506200, 40.482569], [1283506200, 1283508000, 39.629011], [1283508000, 1283509800, 39.105996], [1283509800, 1283511600, 38.922255], [1283511600, 1283513400, 39.080718], [1283513400, 1283515200, 39.578457], [1283515200, 1283517000, 40.406738], [1283517000, 1283518800, 41.551174], [1283518800, 1283520600, 42.991965], [1283520600, 1283522400, 44.704245], [1283522400, 1283524200, 46.658497], [1283524200, 1283526000, 48.821069], [1283526000, 1283527800, 51.154741], [1283527800, 1283529600, 53.619368], [1283529600, 1283531400, 56.172561], [1283531400, 1283533200, 58.770418], [1283533200, 1283535000, 61.368273], [1283535000, 1283536800, 63.921459]]</pre>
<p>Unaggregated series in json: $day.outTemp.series.round(5).json():</p>
<pre>[[1283497200, 1283499000, 46.83544], [1283499000, 1283500800, 44.85591], [1283500800, 1283502600, 43.11835], [1283502600, 1283504400, null], [1283504400, 1283506200, 40.48257], [1283506200, 1283508000, 39.62901], [1283508000, 1283509800, 39.106], [1283509800, 1283511600, 38.92225], [1283511600, 1283513400, 39.08072], [1283513400, 1283515200, 39.57846], [1283515200, 1283517000, 40.40674], [1283517000, 1283518800, 41.55117], [1283518800, 1283520600, 42.99197], [1283520600, 1283522400, 44.70425], [1283522400, 1283524200, 46.6585], [1283524200, 1283526000, 48.82107], [1283526000, 1283527800, 51.15474], [1283527800, 1283529600, 53.61937], [1283529600, 1283531400, 56.17256], [1283531400, 1283533200, 58.77042], [1283533200, 1283535000, 61.36827], [1283535000, 1283536800, 63.92146]]</pre>
<p>Unaggregated series, in json with just start times: $day.outTemp.series(time_series='start').json:</p>
<pre>[[1283497200, 46.835437], [1283499000, 44.855907], [1283500800, 43.118351], [1283502600, null], [1283504400, 40.482569], [1283506200, 39.629011], [1283508000, 39.105996], [1283509800, 38.922255], [1283511600, 39.080718], [1283513400, 39.578457], [1283515200, 40.406738], [1283517000, 41.551174], [1283518800, 42.991965], [1283520600, 44.704245], [1283522400, 46.658497], [1283524200, 48.821069], [1283526000, 51.154741], [1283527800, 53.619368], [1283529600, 56.172561], [1283531400, 58.770418], [1283533200, 61.368273], [1283535000, 63.921459]]</pre>
<p>Unaggregated series, in json with just start times: $day.outTemp.series(time_series='start').round(5).json:</p>
<pre>[[1283497200, 46.83544], [1283499000, 44.85591], [1283500800, 43.11835], [1283502600, null], [1283504400, 40.48257], [1283506200, 39.62901], [1283508000, 39.106], [1283509800, 38.92225], [1283511600, 39.08072], [1283513400, 39.57846], [1283515200, 40.40674], [1283517000, 41.55117], [1283518800, 42.99197], [1283520600, 44.70425], [1283522400, 46.6585], [1283524200, 48.82107], [1283526000, 51.15474], [1283527800, 53.61937], [1283529600, 56.17256], [1283531400, 58.77042], [1283533200, 61.36827], [1283535000, 63.92146]]</pre>
<p>Unaggregated series, in json with start times in milliseconds: $day.outTemp.series(time_series='start', time_unit='unix_epoch_ms').json:</p>
<pre>[[1283497200000, 46.835437], [1283499000000, 44.855907], [1283500800000, 43.118351], [1283502600000, null], [1283504400000, 40.482569], [1283506200000, 39.629011], [1283508000000, 39.105996], [1283509800000, 38.922255], [1283511600000, 39.080718], [1283513400000, 39.578457], [1283515200000, 40.406738], [1283517000000, 41.551174], [1283518800000, 42.991965], [1283520600000, 44.704245], [1283522400000, 46.658497], [1283524200000, 48.821069], [1283526000000, 51.154741], [1283527800000, 53.619368], [1283529600000, 56.172561], [1283531400000, 58.770418], [1283533200000, 61.368273], [1283535000000, 63.921459]]</pre>
<p>Unaggregated series, in json with start times in milliseconds: $day.outTemp.series(time_series='start', time_unit='unix_epoch_ms').round(5).json:</p>
<pre>[[1283497200000, 46.83544], [1283499000000, 44.85591], [1283500800000, 43.11835], [1283502600000, null], [1283504400000, 40.48257], [1283506200000, 39.62901], [1283508000000, 39.106], [1283509800000, 38.92225], [1283511600000, 39.08072], [1283513400000, 39.57846], [1283515200000, 40.40674], [1283517000000, 41.55117], [1283518800000, 42.99197], [1283520600000, 44.70425], [1283522400000, 46.6585], [1283524200000, 48.82107], [1283526000000, 51.15474], [1283527800000, 53.61937], [1283529600000, 56.17256], [1283531400000, 58.77042], [1283533200000, 61.36827], [1283535000000, 63.92146]]</pre>
<p>Unaggregated series, in json, in degrees C: $day.outTemp.series.degree_C.json</p>
<pre>[[1283497200, 1283499000, 8.241909444444444], [1283499000, 1283500800, 7.142170555555556], [1283500800, 1283502600, 6.176861666666665], [1283502600, 1283504400, null], [1283504400, 1283506200, 4.712538333333332], [1283506200, 1283508000, 4.238339444444444], [1283508000, 1283509800, 3.947775555555554], [1283509800, 1283511600, 3.8456972222222223], [1283511600, 1283513400, 3.9337322222222206], [1283513400, 1283515200, 4.210253888888889], [1283515200, 1283517000, 4.670409999999999], [1283517000, 1283518800, 5.30620777777778], [1283518800, 1283520600, 6.106647222222223], [1283520600, 1283522400, 7.057913888888889], [1283522400, 1283524200, 8.143609444444444], [1283524200, 1283526000, 9.345038333333333], [1283526000, 1283527800, 10.641522777777778], [1283527800, 1283529600, 12.010760000000001], [1283529600, 1283531400, 13.429200555555557], [1283531400, 1283533200, 14.872454444444445], [1283533200, 1283535000, 16.315707222222223], [1283535000, 1283536800, 17.734143888888887]]</pre>
<p>Unaggregated series, in json, in degrees C, rounded to 2 decimal places: $day.outTemp.series.degree_C.round(2).json</p>
<pre>[[1283497200, 1283499000, 8.24], [1283499000, 1283500800, 7.14], [1283500800, 1283502600, 6.18], [1283502600, 1283504400, null], [1283504400, 1283506200, 4.71], [1283506200, 1283508000, 4.24], [1283508000, 1283509800, 3.95], [1283509800, 1283511600, 3.85], [1283511600, 1283513400, 3.93], [1283513400, 1283515200, 4.21], [1283515200, 1283517000, 4.67], [1283517000, 1283518800, 5.31], [1283518800, 1283520600, 6.11], [1283520600, 1283522400, 7.06], [1283522400, 1283524200, 8.14], [1283524200, 1283526000, 9.35], [1283526000, 1283527800, 10.64], [1283527800, 1283529600, 12.01], [1283529600, 1283531400, 13.43], [1283531400, 1283533200, 14.87], [1283533200, 1283535000, 16.32], [1283535000, 1283536800, 17.73]]</pre>
<p>Unaggregated series, in json, in degrees C, rounded to 5 decimal places: $day.outTemp.series.degree_C.round(5).json</p>
<pre>[[1283497200, 1283499000, 8.24191], [1283499000, 1283500800, 7.14217], [1283500800, 1283502600, 6.17686], [1283502600, 1283504400, null], [1283504400, 1283506200, 4.71254], [1283506200, 1283508000, 4.23834], [1283508000, 1283509800, 3.94778], [1283509800, 1283511600, 3.8457], [1283511600, 1283513400, 3.93373], [1283513400, 1283515200, 4.21025], [1283515200, 1283517000, 4.67041], [1283517000, 1283518800, 5.30621], [1283518800, 1283520600, 6.10665], [1283520600, 1283522400, 7.05791], [1283522400, 1283524200, 8.14361], [1283524200, 1283526000, 9.34504], [1283526000, 1283527800, 10.64152], [1283527800, 1283529600, 12.01076], [1283529600, 1283531400, 13.4292], [1283531400, 1283533200, 14.87245], [1283533200, 1283535000, 16.31571], [1283535000, 1283536800, 17.73414]]</pre>
<p>Unaggregated series, as a formatted string (<em>not JSON</em>) : $day.outTemp.series:</p>
<pre>00:00, 00:30, 46.8&#176;F
@@ -117,14 +114,14 @@
<hr/>
<h2>Aggregated series</h2>
<p>Aggregated series: $month.outTemp.series(aggregate_type='max', aggregate_interval=86400).json():</p>
<pre>[[1283324400, 1283410800, 79.825823], [1283410800, 1283497200, 79.224876], [1283497200, 1283583600, 63.921459]]</pre>
<p>Aggregated series: $month.outTemp.series(aggregate_type='max', aggregate_interval=86400).round(5).json():</p>
<pre>[[1283324400, 1283410800, 79.82582], [1283410800, 1283497200, 79.22488], [1283497200, 1283583600, 63.92146]]</pre>
<p>Using shortcut 'day': $month.outTemp.series(aggregate_type='max', aggregate_interval='day').json():</p>
<pre>[[1283324400, 1283410800, 79.825823], [1283410800, 1283497200, 79.224876], [1283497200, 1283583600, 63.921459]]</pre>
<p>Using shortcut 'day': $month.outTemp.series(aggregate_type='max', aggregate_interval='day').round(5).json():</p>
<pre>[[1283324400, 1283410800, 79.82582], [1283410800, 1283497200, 79.22488], [1283497200, 1283583600, 63.92146]]</pre>
<p>Order by column: $month.outTemp.series(aggregate_type='max', aggregate_interval=86400).json(order_by="column"):</p>
<pre>[[1283324400, 1283410800, 1283497200], [1283410800, 1283497200, 1283583600], [79.825823, 79.224876, 63.921459]]</pre>
<p>Order by column: $month.outTemp.series(aggregate_type='max', aggregate_interval=86400).round(5).json(order_by="column"):</p>
<pre>[[1283324400, 1283410800, 1283497200], [1283410800, 1283497200, 1283583600], [79.82582, 79.22488, 63.92146]]</pre>
<p>Aggregated series, using $jsonize():
$jsonize($zip($min.start.unix_epoch_ms.raw, $min.data.degree_C.round(2).raw, $max.data.degree_C.round(2).raw))

31
bin/weewx/tests/test_skins/StandardTest/series.html.tmpl
View File

@@ -25,20 +25,17 @@
<body>
<h2>Unaggregated series </h2>
<p>Unaggregated series in json: \$day.outTemp.series.json():</p>
<pre>$day.outTemp.series.json()</pre>
<p>Unaggregated series in json: \$day.outTemp.series.round(5).json():</p>
<pre>$day.outTemp.series.round(5).json()</pre>
<p>Unaggregated series, in json with just start times: \$day.outTemp.series(time_series='start').json:</p>
<pre>$day.outTemp.series(time_series='start').json</pre>
<p>Unaggregated series, in json with just start times: \$day.outTemp.series(time_series='start').round(5).json:</p>
<pre>$day.outTemp.series(time_series='start').round(5).json</pre>
<p>Unaggregated series, in json with start times in milliseconds: \$day.outTemp.series(time_series='start', time_unit='unix_epoch_ms').json:</p>
<pre>$day.outTemp.series(time_series='start', time_unit='unix_epoch_ms').json</pre>
<p>Unaggregated series, in json with start times in milliseconds: \$day.outTemp.series(time_series='start', time_unit='unix_epoch_ms').round(5).json:</p>
<pre>$day.outTemp.series(time_series='start', time_unit='unix_epoch_ms').round(5).json</pre>
<p>Unaggregated series, in json, in degrees C: \$day.outTemp.series.degree_C.json</p>
<pre>$day.outTemp.series.degree_C.json</pre>
<p>Unaggregated series, in json, in degrees C, rounded to 2 decimal places: \$day.outTemp.series.degree_C.round(2).json</p>
<pre>$day.outTemp.series.degree_C.round(2).json</pre>
<p>Unaggregated series, in json, in degrees C, rounded to 5 decimal places: \$day.outTemp.series.degree_C.round(5).json</p>
<pre>$day.outTemp.series.degree_C.round(5).json</pre>
<p>Unaggregated series, as a formatted string (<em>not JSON</em>) : \$day.outTemp.series:</p>
<pre>$day.outTemp.series</pre>
@@ -60,14 +57,14 @@
<hr/>
<h2>Aggregated series</h2>
<p>Aggregated series: \$month.outTemp.series(aggregate_type='max', aggregate_interval=86400).json():</p>
<pre>$month.outTemp.series(aggregate_type='max', aggregate_interval=86400).json()</pre>
<p>Aggregated series: \$month.outTemp.series(aggregate_type='max', aggregate_interval=86400).round(5).json():</p>
<pre>$month.outTemp.series(aggregate_type='max', aggregate_interval=86400).round(5)json()</pre>
<p>Using shortcut 'day': \$month.outTemp.series(aggregate_type='max', aggregate_interval='day').json():</p>
<pre>$month.outTemp.series(aggregate_type='max', aggregate_interval='day').json()</pre>
<p>Using shortcut 'day': \$month.outTemp.series(aggregate_type='max', aggregate_interval='day').round(5).json():</p>
<pre>$month.outTemp.series(aggregate_type='max', aggregate_interval='day').round(5).json()</pre>
<p>Order by column: \$month.outTemp.series(aggregate_type='max', aggregate_interval=86400).json(order_by="column"):</p>
<pre>$month.outTemp.series(aggregate_type='max', aggregate_interval=86400).json(order_by="column")</pre>
<p>Order by column: \$month.outTemp.series(aggregate_type='max', aggregate_interval=86400).round(5).json(order_by="column"):</p>
<pre>$month.outTemp.series(aggregate_type='max', aggregate_interval=86400).round(5).json(order_by="column")</pre>
<p>Aggregated series, using \$jsonize():
\$jsonize(\$zip(\$min.start.unix_epoch_ms.raw, \$min.data.degree_C.round(2).raw, \$max.data.degree_C.round(2).raw))

2
setup.py
View File

@@ -32,7 +32,7 @@ from distutils.command.install_lib import install_lib
from distutils.core import setup
from distutils.debug import DEBUG
VERSION = "4.6.0b3"
VERSION = "4.6.0b4"
if sys.version_info < (2, 7):
log.fatal('WeeWX requires Python V2.7 or greater.')

2
skins/Mobile/index.html.tmpl
View File

@@ -8,7 +8,7 @@
##
## vince@skahan.net - 1/16/2010
##
## Version: 4.6.0b3
## Version: 4.6.0b4
##
#errorCatcher Echo
#encoding UTF-8

2
skins/Seasons/index.html.tmpl
View File

@@ -1,6 +1,6 @@
## Copyright 2009-2018 Tom Keffer, Matthew Wall
## Distributed under terms of GPLv3. See LICENSE.txt for your rights.
## Version: 4.6.0b3
## Version: 4.6.0b4
#errorCatcher Echo
##
<!DOCTYPE html>

2
skins/Smartphone/index.html.tmpl
View File

@@ -1,5 +1,5 @@
#encoding UTF-8
## Version: 4.6.0b3
## Version: 4.6.0b4
<!DOCTYPE html>
<html lang="$gettext('lang')">
<head>

2
skins/Standard/index.html.tmpl
View File

@@ -1,6 +1,6 @@
## Copyright 2009-2021 Tom Keffer
## Distributed under terms of GPLv3. See LICENSE.txt for your rights.
## Version: 4.6.0b3
## Version: 4.6.0b4
#errorCatcher Echo
#encoding UTF-8
##

2
weewx.conf
View File

@@ -23,7 +23,7 @@ log_failure = True
socket_timeout = 20
# Do not modify this. It is used when installing and updating weewx.
version = 4.6.0b3
version = 4.6.0b4
##############################################################################