Merge remote-tracking branch 'origin/master' into development

# Conflicts:
#	docs/changes.txt
This commit is contained in:
Tom Keffer
2022-10-21 16:03:59 -07:00
3 changed files with 7 additions and 2 deletions

View File

@@ -783,7 +783,7 @@ class WindVec(XType):
# Yes. Just use the regular series function. When it comes time to do the aggregation,
# the specialized function WindVec.get_aggregate() (defined below), will be used.
return ArchiveTable.get_series(obs_type, timespan, db_manager, aggregate_type,
aggregate_interval)
aggregate_interval, **option_dict)
else:
# No aggregation desired. However, we have will have to assemble the wind vector from

View File

@@ -49,6 +49,11 @@ for weewx.conf.
Post location of configuration file to the station registry. Thanks to Vince!
PR #705.
Fix minor install warning under Python 3.10. Fixes issue #799.
Fix problem where xtypes.ArchiveTable.get_series() does not pass option_dict
on to get_aggregate(). Fixes issue #797
Added copytruncate option to default log rotation configuration. Thanks to
user sastorsl. Addresses PR #791.

View File

@@ -9,6 +9,6 @@
home = /home/weewx
prefix =
exec-prefix =
exec_prefix =
install_lib = %(home)s/bin
install_scripts = %(home)s/bin