From cd9588d7d8bfd25a50e788278c9aa170f937d482 Mon Sep 17 00:00:00 2001
From: Tom Keffer <tkeffer@gmail.com>
Date: Mon, 17 Oct 2022 18:19:27 -0700
Subject: [PATCH 1/2] Fix install warning

Fixes issue #799
---
 docs/changes.txt | 2 ++
 setup.cfg        | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index e02a9968..ce8fb4b0 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -49,6 +49,8 @@ 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.
+
 
 4.8.0 04/21/2022
 Allow unit to be overridden for a specific plot by using new option 'unit'.
diff --git a/setup.cfg b/setup.cfg
index 38532f64..5d560f5b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -9,6 +9,6 @@
 home = /home/weewx
 
 prefix =
-exec-prefix =
+exec_prefix =
 install_lib = %(home)s/bin
 install_scripts = %(home)s/bin

From 0ff2cb012995eeb541dd329935893a29f87cd9fb Mon Sep 17 00:00:00 2001
From: Tom Keffer <tkeffer@gmail.com>
Date: Wed, 19 Oct 2022 05:12:17 -0700
Subject: [PATCH 2/2] Pass option_dict to get_aggregate() in wind version of
 get_series()

The function xtypes.ArchiveTable.get_series() does not
pass option_dict on to get_aggregate(). Fixes issue #797
---
 bin/weewx/xtypes.py | 2 +-
 docs/changes.txt    | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/weewx/xtypes.py b/bin/weewx/xtypes.py
index cd2a4ecb..48fe9f83 100644
--- a/bin/weewx/xtypes.py
+++ b/bin/weewx/xtypes.py
@@ -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
diff --git a/docs/changes.txt b/docs/changes.txt
index ce8fb4b0..e0f9bb58 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -51,6 +51,9 @@ 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
+
 
 4.8.0 04/21/2022
 Allow unit to be overridden for a specific plot by using new option 'unit'.