Reintegrate from the v3 branch.

V3.0.0b1

Author: Tom Keffer

MANIFEST

@@ -1,24 +1,22 @@
+# file GENERATED by distutils, do NOT edit
 LICENSE.txt
 README
 setup.cfg
 setup.py
 weewx.conf
 bin/daemon.py
 bin/wee_config_database
-bin/wee_config_fousb
-bin/wee_config_te923
-bin/wee_config_vantage
-bin/wee_config_ws23xx
-bin/wee_config_ws28xx
+bin/wee_config_device
 bin/wee_reports
 bin/weewxd
 bin/examples/__init__.py
 bin/examples/alarm.py
 bin/examples/lowBattery.py
 bin/examples/xsearch.py
+bin/schemas/__init__.py
+bin/schemas/wview.py
 bin/user/__init__.py
 bin/user/extensions.py
-bin/user/schemas.py
 bin/weedb/__init__.py
 bin/weedb/mysql.py
 bin/weedb/sqlite.py
@@ -32,23 +30,24 @@ bin/weeutil/ftpupload.py
 bin/weeutil/rsyncupload.py
 bin/weeutil/weeutil.py
 bin/weewx/__init__.py
-bin/weewx/abstractstation.py
 bin/weewx/accum.py
 bin/weewx/almanac.py
-bin/weewx/archive.py
 bin/weewx/cheetahgenerator.py
 bin/weewx/crc16.py
+bin/weewx/engine.py
 bin/weewx/filegenerator.py
 bin/weewx/imagegenerator.py
+bin/weewx/manager.py
 bin/weewx/reportengine.py
-bin/weewx/restful.py
 bin/weewx/restx.py
 bin/weewx/station.py
-bin/weewx/stats.py
+bin/weewx/tags.py
 bin/weewx/units.py
 bin/weewx/uwxutils.py
 bin/weewx/wxengine.py
 bin/weewx/wxformulas.py
+bin/weewx/wxmanager.py
+bin/weewx/wxservices.py
 bin/weewx/drivers/__init__.py
 bin/weewx/drivers/cc3000.py
 bin/weewx/drivers/fousb.py
@@ -65,31 +64,14 @@ bin/weewx/drivers/ws28xx.py
 docs/changes.txt
 docs/copyright.htm
 docs/customizing.htm
-docs/day-gap-not-shown.png
-docs/day-gap-showing.png
-docs/daytemp_with_avg.png
 docs/debian.htm
-docs/ferrites.jpg
-docs/funky_degree.png
-docs/logo-apple.png
-docs/logo-centos.png
-docs/logo-debian.png
-docs/logo-fedora.png
-docs/logo-linux.png
-docs/logo-mint.png
-docs/logo-opensuse.png
-docs/logo-redhat.png
-docs/logo-suse.png
-docs/logo-ubuntu.png
-docs/logo-weewx.png
 docs/readme.htm
 docs/redhat.htm
 docs/setup.htm
 docs/suse.htm
 docs/upgrading.htm
 docs/usersguide.htm
-docs/weekgustoverlay.png
-docs/yearhilow.png
+docs/css/jquery.tocify.css
 docs/css/weewx_docs.css
 docs/css/ui-lightness/jquery-ui-1.10.4.custom.css
 docs/css/ui-lightness/jquery-ui-1.10.4.custom.min.css
@@ -107,9 +89,35 @@ docs/css/ui-lightness/images/ui-icons_228ef1_256x240.png
 docs/css/ui-lightness/images/ui-icons_ef8c08_256x240.png
 docs/css/ui-lightness/images/ui-icons_ffd27a_256x240.png
 docs/css/ui-lightness/images/ui-icons_ffffff_256x240.png
+docs/images/day-gap-not-shown.png
+docs/images/day-gap-showing.png
+docs/images/daycompare.png
+docs/images/daytemp_with_avg.png
+docs/images/daywindvec.png
+docs/images/ferrites.jpg
+docs/images/funky_degree.png
+docs/images/image_parts.png
+docs/images/logo-apple.png
+docs/images/logo-centos.png
+docs/images/logo-debian.png
+docs/images/logo-fedora.png
+docs/images/logo-linux.png
+docs/images/logo-mint.png
+docs/images/logo-opensuse.png
+docs/images/logo-redhat.png
+docs/images/logo-suse.png
+docs/images/logo-ubuntu.png
+docs/images/logo-weewx.png
+docs/images/sample_monthrain.png
+docs/images/weekgustoverlay.png
+docs/images/weektempdew.png
+docs/images/yearhilow.png
+docs/js/jquery-1.11.1.min.js
 docs/js/jquery-ui-1.10.4.custom.min.js
-docs/js/jquery.min.js
 docs/js/jquery.toc-1.1.4.min.js
+docs/js/jquery.tocify-1.9.0.js
+docs/js/jquery.tocify-1.9.0.min.js
+docs/js/weewx.js
 extensions/basic/changelog
 extensions/basic/install.py
 extensions/basic/readme.txt
@@ -119,10 +127,22 @@ extensions/basic/skins/basic/favicon.ico
 extensions/basic/skins/basic/hilo.inc
 extensions/basic/skins/basic/index.html.tmpl
 extensions/basic/skins/basic/skin.conf
+extensions/fileparse/changelog
+extensions/fileparse/install.py
+extensions/fileparse/readme.txt
+extensions/fileparse/bin/user/fileparse.py
+extensions/pmon/changelog
+extensions/pmon/install.py
+extensions/pmon/readme.txt
+extensions/pmon/bin/user/pmon.py
+extensions/pmon/skins/pmon/index.html.tmpl
+extensions/pmon/skins/pmon/skin.conf
 extensions/xstats/changelog
 extensions/xstats/install.py
 extensions/xstats/readme.txt
 extensions/xstats/bin/user/xstats.py
+extensions/xstats/skins/xstats/index.html.tmpl
+extensions/xstats/skins/xstats/skin.conf
 skins/Ftp/skin.conf
 skins/Rsync/skin.conf
 skins/Standard/favicon.ico
@@ -166,3 +186,4 @@ util/logwatch/conf/logfiles/weewx.conf
 util/logwatch/conf/services/weewx.conf
 util/logwatch/scripts/services/weewx
 util/rsyslog.d/weewx.conf
+util/systemd/weewx.service

NEW_FEATURES.txt

@@ -18,11 +18,6 @@ Offer tags to support JSON. In particular, vectors. A tag like
 $day.outTemp.vector would offer a vector of temperatures for the day.
 Aggregation would be nice.
 
-Allow statistics to be extracted from the archive database, as well as the
-stats database. This would allow hourly statistics. Taken to the extreme, it
-could also allow the elimination of the stats database if the performance is
-acceptable.
-
 Allow new derived types to be created by the user. Right now, things like
 heating and cooling degree days are hardwired in, but it ought to be possible
 to add things like that modularly. 
@@ -41,14 +36,6 @@ Harden up the MySQL database connection.
 Allow reporting services to be fired off at something other than every
 archive period. In particular, FTP.
 
-possibly implement averaging rainRate calculation instead of the
-current near-instantaneous implementation in fousb
-
-New observation types would have their unit group attached as a suffix.
-E.g., _energy.
-
-Offer a more "weather friendly" Metric unit system.
-
 Offer "cumulative" as an aggregation type.
 
 Allow rain-to-date to be added to a partial rainyear.
@@ -67,8 +54,6 @@ Port to Windows.
 Allow variable y-axis labelling. Right now it's hardwired to every other major
 tick mark.
 
-Make units extensible.
-
 Add log_success/log_failure parameters for subsystems other than just restx.
 
 Graphing system feature requests:

TODO.txt

@@ -1,10 +1,34 @@
-TODO before the next release:
+--------------------  TODO for V3  --------------------------- 
 
-Document the new capabilities of the wee_config_vantage utility.
+Should the archive file be backed up before adding the daily summaries?
+  - Probably.
 
-Figure out why the heartbeat doesn't work on the WMR200.
+Prompt for extension-specific parameters
 
-add documentation for the extension installer and extension packaging.
+
+
+--------------------  Nice to do (V3.1?)  --------------------------- 
+
+Make setup.py do nicer formatting to weewx.conf
+  - spacing before when injecting skin stanzas
+  - spacing before when injecting database and binding stanzas
+  - rows of hashmarks when injecting service stanzas such as [Forecast]
+  - inject service stanzas somewhere other than end of file
+  - inject skin stanzas before ftp and rsync
+
+The StdArchive service should extract everything it can from the accumulators,
+whether or not software record generation is used.
+  - This could be added later.
+
+Implement a $time_ago, or $timespan tag (see email with Gary Roderick).
+  - This could be added later.
+
+Look at Gary's (?) changes to allow cron-like report generation.
+
+Is max gap fraction meaningful for bar charts now?
+
+Fix units in cmon to use kilo, mega, giga, tera?
+ - scaling probably should be done in the plotting, not unit as types
 
 Guard against database locks:
 
@@ -33,3 +57,120 @@ Jul 30 08:55:22 hummingbird weewx[959]:     ****    File "/home/weewx/bin/weedb/
 Jul 30 08:55:22 hummingbird weewx[959]:     ****      self.connection.commit()
 Jul 30 08:55:22 hummingbird weewx[959]:     ****  OperationalError: database is locked
 Jul 30 08:55:22 hummingbird weewx[959]:     ****  Exiting.
+
+
+--------------------  DONE  --------------------------- 
+
+Quick start guide
+(11/28/14 tk)
+
+Test on redhat
+ - rpm install and upgrade
+ - extension installer
+Test on suse
+ - rpm install and upgrade
+ - extension installer
+(28nov14 mwall)
+
+Move schemas to the extension that uses them.
+  - this has always been the case for cmon, pmon, and forecast
+
+Test new extension installer on debian
+(23nov14 mwall)
+
+Test new setup.py on debian deb upgrades
+(23nov14 mwall)
+
+Prompt for station-specific parameters
+(23nov14 mwall)
+
+The station hardware configuration process could be improved. 
+  - Nowhere is it listed what driver to use.
+  - Docs need to be updated with the new two-step process.
+  - Perhaps the configuration routine could be made interactive? It would
+    scan the "drivers" subdirectory and offer up the choices...
+(23nov14 mwall)
+
+Include setup.py in the installation (also setup.cfg)
+(22nov14 mwall)
+
+Document how to extend the unit system.
+ - deferred documentation to see if we like it.
+(20nov14 tk)
+ 
+Extending the accumulators
+ - use the same strategy as the unit system
+ - deferred documentation to see if we like it.
+(20nov14 tk)
+
+Update the forecast service
+forecast is now working with the database structure
+(17nov14 mwall)
+
+Add parameter max_delta to $current.
+(16nov14 -tk)
+
+Strategy for extending units.
+(16nov14 -tk)
+
+May need to update the guide on packaging an extension.
+modified the docs to match the new setup.py syntax
+(15nov14 mwall)
+
+Update setup.py
+ -- Rework deb installer to work with device snippets
+ -- Give each driver option to modify driver stanza while updating weewx.conf
+ -- the --configure option should modify station_type if successful
+(15nov14 mwall)
+              
+Update setup.py.
+  -- Add configure keyword, with option --device=
+  setup.py --configure [--driver=weewx.drivers.simulator]
+(14nov14 mwall)
+
+Update skins: exfoliation amphibian simple
+Update drivers: owfs link fileparse
+Update services: cmon crt cwxn
+Put fileparse driver into extensions directory as driver example
+(14nov14 mwall)
+
+Check existing extensions: basic xstats
+(13nov14 mwall)
+
+Update services to use new database
+cmon pmon
+(13nov14 mwall)
+
+Update setup.py.
+  -- General update strategy for weewx.conf
+     (11/13/14 by tk)
+     
+Update uploader extensions to use new database.
+emoncms mqtt owm seg thingspeak twitter wbug wcloud wetter windfinder xively
+(11/12/14 by Matthew)
+
+Update Upgrading Guide.
+ - explain how to migrate data from a v2 database to a v3 database
+ - Changes in search list extensions
+ 
+Verify that examples still work:
+  alarm.py 
+  lowBattery.py
+  xsearch.py
+(11/10/14. All are OK. I checked/updated them when updating the docs)
+
+The table name is explicitly specified in the uploader database queries. E.g.,
+  "SELECT SUM(rain), MIN(usUnits), MAX(usUnits) FROM archive WHERE dateTime>=? AND dateTime<=?"
+Does this matter?
+(11/11/14. Now substitutes the table name into the query string)
+
+On startup, the log should indicate not only which binding is in use, but what
+it is bound to (sqlite or mysql).
+
+Both tables archive_day_windSpeed and archive_day_wind exist. 
+[11/11/14. Both now get updated. $day.wind.max and $day.windSpeed.max return the same thing]
+
+I removed Appendix: Statistical types because it is no longer valid. But,
+it needs to be explained somewhere the difference between vector and scalar
+stats.
+[11/11/14. Added a section "Winds" to the Customizing Guide, explaining the differences.]

bin/daemon.py

@@ -1,8 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 #
-#    $Revision$
-#    $Author$
-#    $Date$
+#    $Id$
 #
 '''
     This module is used to fork the current process into a daemon.

bin/examples/__init__.py

@@ -3,9 +3,7 @@
 #
 #    See the file LICENSE.txt for your full rights.
 #
-#    $Revision$
-#    $Author$
-#    $Date$
+#    $Id$
 #
 """
 Examples for customizing weewx