Merge branch 'development' into python3

bin/weecfg/test/expected/weewx39_user_expected.conf

@@ -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 = 3.9.0
+version = 3.9.1
 
 ##############################################################################
 

bin/weeplot/genplot.py

@@ -131,8 +131,8 @@ class GeneralPlot(object):
 
     @staticmethod
     def normalize_path(skin_dir, path):
-        if os.path.isabs(path):
-            return path
+        if path is None:
+            return None
         return os.path.join(skin_dir, path)
 
     def setBottomLabel(self, bottom_label):

bin/weewx/__init__.py

@@ -6,7 +6,7 @@
 """Package weewx, containing modules specific to the weewx runtime engine."""
 import time
 
-__version__="3.9.0"
+__version__="3.9.1"
 
 # Holds the program launch time in unix epoch seconds:
 # Useful for calculating 'uptime.'

bin/weewx/engine.py

@@ -443,6 +443,7 @@ class StdArchive(StdService):
         if 'StdArchive' in config_dict:
             self.data_binding = config_dict['StdArchive'].get('data_binding', 'wx_binding')
             self.record_generation = config_dict['StdArchive'].get('record_generation', 'hardware').lower()
+            self.no_catchup = to_bool(config_dict['StdArchive'].get('no_catchup', False))
             self.archive_delay = to_int(config_dict['StdArchive'].get('archive_delay', 15))
             software_interval = to_int(config_dict['StdArchive'].get('archive_interval', 300))
             self.loop_hilo = to_bool(config_dict['StdArchive'].get('loop_hilo', True))
@@ -509,10 +510,11 @@ class StdArchive(StdService):
     
     def startup(self, event):  # @UnusedVariable
         """Called when the engine is starting up."""
-        # The engine is starting up. If hardware record generation has been specified,
-        # the main task is to do a catch up on any
-        # data still on the station, but not yet put in the database.
-        if self.record_generation == 'hardware':
+        # The engine is starting up. Unless the user has specified otherwise, the main task
+        # is to do a catch up on any data still on the station, but not yet put in the database.
+        if self.no_catchup:
+            syslog.syslog(syslog.LOG_DEBUG, "engine: No catchup specified.")
+        else:
             # Not all consoles can do a hardware catchup, so be prepared to catch the exception:
             try:
                 self._catchup(self.engine.console.genStartupRecords)

docs/changes.txt

@@ -1,6 +1,14 @@
 weewx change history
 --------------------
 
+3.9.1 02/06/2019
+
+In genplot, do not attempt to normalize unspecified paths.
+
+Introduced option no_catchup. If set to true, a catchup will not be
+attempted. Fixes issue #368.
+
+
 3.9.0 02/05/2019
 
 New skin called Seasons. For new users, it will be installed and enabled.

makefile

@@ -282,7 +282,7 @@ release:
 	ssh $(USER)@$(WEEWX_COM) "rm -f $(WEEWX_DOWNLOADS)/weewx*"
 	ssh $(USER)@$(WEEWX_COM) "for f in $(ARTIFACTS); do if [ -f $(RELDIR)/\$$f ]; then ln -s released_versions/\$$f $(WEEWX_DOWNLOADS); fi; done"
 	ssh $(USER)@$(WEEWX_COM) "if [ -f $(DEVDIR)/README.txt ]; then mv $(DEVDIR)/README.txt $(WEEWX_DOWNLOADS); fi"
-	ssh $(USER)@$(WEEWX_COM) "chmod 644 $(WEEWX_DOWNLOADS)/released_versions/*"
+	ssh $(USER)@$(WEEWX_COM) "chmod 664 $(WEEWX_DOWNLOADS)/released_versions/*"
 
 # make local copy of the published apt repository
 pull-apt-repo:

pkg/changelog.rpm

@@ -1,3 +1,5 @@
+* Wed Feb 06 2019 Matthew Wall (weewx) <mwall@users.sourceforge.net> - 3.9.1-1
+- new upstream release
 * Tue Feb 05 2019 Matthew Wall (weewx) <mwall@users.sourceforge.net> - 3.9.0-1
 - new upstream release
 * Mon Jan 28 2019 Matthew Wall (weewx) <mwall@users.sourceforge.net> - 3.9.0b3-1

pkg/debian/changelog

@@ -1,3 +1,6 @@
+weewx (3.9.1-1) unstable; urgency=low
+  * new upstream release
+ -- Matthew Wall (weewx) <mwall@users.sourceforge.net>  Wed, 06 Feb 2019 08:21:47 -0500
 weewx (3.9.0-1) unstable; urgency=low
   * new upstream release
  -- Matthew Wall (weewx) <mwall@users.sourceforge.net>  Tue, 05 Feb 2019 13:32:45 -0500

weewx.conf

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