mirror of
https://github.com/weewx/weewx.git
synced 2026-04-20 01:26:56 -04:00
Catch up with V1.14.0
This commit is contained in:
Tom Keffer
24
MANIFEST
24
MANIFEST
@@ -71,18 +71,18 @@ skins/Standard/backgrounds/drops.gif
|
||||
skins/Standard/backgrounds/flower.jpg
|
||||
skins/Standard/backgrounds/leaf.jpg
|
||||
skins/Standard/backgrounds/night.gif
|
||||
skins/Standard/mobile/barometer.html.tmpl
|
||||
skins/Standard/mobile/custom.js
|
||||
skins/Standard/mobile/humidity.html.tmpl
|
||||
skins/Standard/mobile/index.html.tmpl
|
||||
skins/Standard/mobile/radar.html.tmpl
|
||||
skins/Standard/mobile/rain.html.tmpl
|
||||
skins/Standard/mobile/temp_outside.html.tmpl
|
||||
skins/Standard/mobile/wind.html.tmpl
|
||||
skins/Standard/mobile/icons/icon_ipad_x1.png
|
||||
skins/Standard/mobile/icons/icon_ipad_x2.png
|
||||
skins/Standard/mobile/icons/icon_iphone_x1.png
|
||||
skins/Standard/mobile/icons/icon_iphone_x2.png
|
||||
skins/Standard/smartphone/barometer.html.tmpl
|
||||
skins/Standard/smartphone/custom.js
|
||||
skins/Standard/smartphone/humidity.html.tmpl
|
||||
skins/Standard/smartphone/index.html.tmpl
|
||||
skins/Standard/smartphone/radar.html.tmpl
|
||||
skins/Standard/smartphone/rain.html.tmpl
|
||||
skins/Standard/smartphone/temp_outside.html.tmpl
|
||||
skins/Standard/smartphone/wind.html.tmpl
|
||||
skins/Standard/smartphone/icons/icon_ipad_x1.png
|
||||
skins/Standard/smartphone/icons/icon_ipad_x2.png
|
||||
skins/Standard/smartphone/icons/icon_iphone_x1.png
|
||||
skins/Standard/smartphone/icons/icon_iphone_x2.png
|
||||
start_scripts/BSD/weewx
|
||||
start_scripts/Debian/weewx
|
||||
start_scripts/SuSE/weewx
|
||||
|
||||
@@ -22,7 +22,7 @@ import time
|
||||
|
||||
# 3rd party imports:
|
||||
import configobj
|
||||
import weeutil.daemon
|
||||
import daemon
|
||||
|
||||
# weewx imports:
|
||||
import weewx.archive
|
||||
@@ -32,7 +32,7 @@ import weewx.reportengine
|
||||
import weeutil.weeutil
|
||||
|
||||
usagestr = """
|
||||
%prog config_path [--help] [--daemon] [--pidfile pidfile] [--version] [--exit]
|
||||
%prog config_path [--help] [--daemon] [--pidfile=PIDFILE] [--version] [--exit]
|
||||
|
||||
Entry point to the weewx weather program. Can be run from the command
|
||||
line or, by specifying the '--daemon' option, as a daemon.
|
||||
@@ -689,7 +689,7 @@ def parseArgs():
|
||||
sys.exit(weewx.CMD_ERROR)
|
||||
|
||||
if options.daemon:
|
||||
weeutil.daemon.daemonize(pidfile=options.pidfile)
|
||||
daemon.daemonize(pidfile=options.pidfile)
|
||||
|
||||
return (options, args)
|
||||
|
||||
|
||||
@@ -21,15 +21,17 @@ argparse.py in any sys.path directory.
|
||||
When doing DMPAFT, no longer tries to correct for DST.
|
||||
|
||||
|
||||
1.14.0 06/15/12
|
||||
1.14.0 06/18/12
|
||||
|
||||
Added smartphone formatted mobile webpage, contributed by user Torbjörn Einarsson.
|
||||
It is generated by default. If you have custom templates, see the upgrade guide
|
||||
on how to have these webpages generated. Thanks, Tobbe!
|
||||
If you are doing a fresh install, then these pages will be generated automatically.
|
||||
If you are doing an upgrade, then see the upgrade guide on how to have these webpages
|
||||
generated. Thanks, Tobbe!
|
||||
|
||||
Three changes suggested by user Charlie Spirakis:
|
||||
o Changed umask in daemon.py to 0022.
|
||||
o Allow location of process ID file to be specified on the command line.
|
||||
o Changed umask in daemon.py to 0022;
|
||||
o Allow location of process ID file to be specified on the command line
|
||||
of weewx;
|
||||
o Start script allows daemon to be run as a specific user.
|
||||
Thanks, Charlie!
|
||||
|
||||
|
||||
@@ -1625,10 +1625,11 @@ outTemp = Outside Temperature</pre>
|
||||
label = Rain (daily avg)</pre>
|
||||
<p>
|
||||
This will generate an image file with name <span class="code">monthrain.png</span>.
|
||||
It will be a bar plot. Option <span class="code">yscale</span> controls the
|
||||
y-axis scaling — if left out, the scale will automatically be chosen. However,
|
||||
in this example we are choosing to exercise some degree of control by specifying
|
||||
values explicitly. It is a 3-way tuple (<span class="code">ylow</span>, <span class="code">yhigh</span>, <span class="code">min_interval</span>), where <span class="code">ymin</span> and <span class="code">ymax</span> are the minimum
|
||||
It will be a bar plot. Option <span class="code">yscale</span>
|
||||
controls the y-axis scaling — if left out, the scale will
|
||||
automatically be chosen. However, in this example we are
|
||||
choosing to exercise some degree of control by specifying values
|
||||
explicitly. The option takes a 3-way tuple (<span class="code">ylow</span>, <span class="code">yhigh</span>, <span class="code">min_interval</span>), where <span class="code">ylow</span> and <span class="code">yhigh</span> are the minimum
|
||||
and maximum y-axis values, respectively, and <span class="code">min_interval</span>
|
||||
is the minimum tick interval. If set to '<span class="code">None</span>', the
|
||||
corresponding value will be automatically chosen. So, in this example, we are
|
||||
|
||||
@@ -23,11 +23,11 @@
|
||||
<p>What follows are directions for upgrading from specific versions.</p>
|
||||
<h2>V1.13 or earlier</h2>
|
||||
<p>Version 1.14 introduces some new webpages that have been expressly formatted for
|
||||
the smartphone, using <a href="http://jquery.com/">jQuery</a>.</p>
|
||||
the smartphone by using <a href="http://jquery.com/">jQuery</a>.</p>
|
||||
<p>The skins shipped with the distribution take advantage of these features. If
|
||||
you do nothing, your old skins will continue to work, but you will not take
|
||||
you do nothing, your old skins will continue to work, but you will not be taking
|
||||
advantage of these new webpages.</p>
|
||||
<p>If you want these new webpages, then you have two choices:</p>
|
||||
<p>If you want them, then you have two choices:</p>
|
||||
<ol>
|
||||
<li>Rename your old skin directory (call it "<span class="code">skins.old</span>")
|
||||
then do the install. This will install the new skin distribution. You can
|
||||
@@ -37,30 +37,30 @@ advantage of these new webpages.</p>
|
||||
<li>Alternatively, change the contents of your existing skin directory to
|
||||
include the new webpages. If you take this approach, you will need to copy
|
||||
over the contents of the subdirectory <span class="code">
|
||||
skins/Standard/mobile</span> from the distribution into your <span class="code">skins/Standard</span>
|
||||
skins/Standard/smartphone</span> from the distribution into your <span class="code">skins/Standard</span>
|
||||
directory. You will then need to modify your <span class="code">skin.conf</span>.
|
||||
</ol>
|
||||
<p class="indent">Replace the section that looks like</p>
|
||||
<p class="indent">After the section that looks like</p>
|
||||
<pre class="style1"> [[[Mobile]]]
|
||||
template = mobile.html.tmpl</pre>
|
||||
<p class="indent">with a section that looks like</p>
|
||||
<pre class="style1"> [[[Mobile]]]
|
||||
template = mobile/index.html.tmpl
|
||||
<p class="indent">add the following directives:</p>
|
||||
<pre class="style1"> [[[MobileSmartphone]]]
|
||||
template = smartphone/index.html.tmpl
|
||||
|
||||
[[[MobileTempOutside]]]
|
||||
template = mobile/temp_outside.html.tmpl
|
||||
template = smartphone/temp_outside.html.tmpl
|
||||
|
||||
[[[MobileRain]]]
|
||||
template = mobile/rain.html.tmpl
|
||||
template = smartphone/rain.html.tmpl
|
||||
|
||||
[[[MobileBarometer]]]
|
||||
template = mobile/barometer.html.tmpl
|
||||
template = smartphone/barometer.html.tmpl
|
||||
|
||||
[[[MobileWind]]]
|
||||
template = mobile/wind.html.tmpl
|
||||
template = smartphone/wind.html.tmpl
|
||||
|
||||
[[[MobileRadar]]]
|
||||
template = mobile/radar.html.tmpl</pre>
|
||||
template = smartphone/radar.html.tmpl</pre>
|
||||
<p class="indent">Then modify section <span class="code">[CopyGenerator]</span>
|
||||
to add the <span class="highlight">highlighted</span> files:</p>
|
||||
<pre class="style1">[CopyGenerator]
|
||||
@@ -70,10 +70,12 @@ to add the <span class="highlight">highlighted</span> files:</p>
|
||||
#
|
||||
|
||||
# List of files that are to be copied at the first invocation of the generator only
|
||||
copy_once = backgrounds/*, weewx.css, mobile.css, favicon.ico, <span class="highlight">mobile/icons/*, mobile/custom.js</span></pre>
|
||||
copy_once = backgrounds/*, weewx.css, mobile.css, favicon.ico, <span class="highlight">smartphone/icons/*, smartphone/custom.js</span></pre>
|
||||
<p>Whichever approach you chose, the generated files will appear in
|
||||
<span class="code">public_html/mobile</span>. The start of the document root
|
||||
will be at <span class="code">public_html/mobile/index.html</span>.</p>
|
||||
<span class="code">public_html/smartphone</span>. The start of the document root
|
||||
will be at <span class="code">public_html/smartphone/index.html</span>. You may want
|
||||
to add a link to this in the template for your main index page
|
||||
<span class="code">skins/Standard/index.html.tmpl</span>.</p>
|
||||
<h2>V1.12 or earlier</h2>
|
||||
<p>Version 1.13 changed the way binding happens to the databases used in reports
|
||||
so that it happens much later. The upshot is that the signature of a few
|
||||
|
||||
21
setup.py
21
setup.py
@@ -2,7 +2,7 @@
|
||||
#
|
||||
# weewx --- A simple, high-performance weather station server
|
||||
#
|
||||
# Copyright (c) 2009, 2010, 2011, 2012 Tom Keffer <tkeffer@gmail.com>
|
||||
# Copyright (c) 2009, 2010, 2011 Tom Keffer <tkeffer@gmail.com>
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
@@ -44,8 +44,6 @@
|
||||
6. It backs up any pre-existing bin subdirectory.
|
||||
|
||||
7. It conserves the ./bin/user subdirectory.
|
||||
|
||||
8. Finally, it tries to tidy up things left behind from earlier versions.
|
||||
"""
|
||||
|
||||
import os
|
||||
@@ -55,8 +53,8 @@ import shutil
|
||||
import sys
|
||||
import tempfile
|
||||
import time
|
||||
|
||||
import configobj
|
||||
|
||||
from distutils.core import setup
|
||||
from distutils.command.install_data import install_data
|
||||
from distutils.command.install_lib import install_lib
|
||||
@@ -354,7 +352,8 @@ setup(name='weewx',
|
||||
url='http://www.weewx.com',
|
||||
package_dir = {'' : 'bin'},
|
||||
packages = ['weewx', 'weeplot', 'weeutil', 'examples', 'user'],
|
||||
scripts = ['bin/config_database.py', 'bin/config_vp.py', 'bin/weewxd.py', 'bin/runreports.py'],
|
||||
py_modules = ['daemon'],
|
||||
scripts = ['bin/configure.py', 'bin/weewxd.py', 'bin/runreports.py'],
|
||||
data_files = [('', ['LICENSE.txt', 'README', 'weewx.conf']),
|
||||
('docs', ['docs/CHANGES.txt', 'docs/customizing.htm',
|
||||
'docs/daytemp_with_avg.png', 'docs/debian.htm',
|
||||
@@ -366,12 +365,12 @@ setup(name='weewx',
|
||||
('skins/Standard/backgrounds', ['skins/Standard/backgrounds/band.gif']),
|
||||
('skins/Standard/NOAA', ['skins/Standard/NOAA/NOAA-YYYY.txt.tmpl', 'skins/Standard/NOAA/NOAA-YYYY-MM.txt.tmpl']),
|
||||
('skins/Standard/RSS', ['skins/Standard/RSS/weewx_rss.xml.tmpl']),
|
||||
('skins/Standard/mobile', ['skins/Standard/mobile/barometer.html.tmpl', 'skins/Standard/mobile/custom.js',
|
||||
'skins/Standard/mobile/humidity.html.tmpl', 'skins/Standard/mobile/index.html.tmpl',
|
||||
'skins/Standard/mobile/radar.html.tmpl', 'skins/Standard/mobile/rain.html.tmpl',
|
||||
'skins/Standard/mobile/temp_outside.html.tmpl', 'skins/Standard/mobile/wind.html.tmpl']),
|
||||
('skins/Standard/mobile/icons',['skins/Standard/mobile/icons/icon_ipad_x1.png', 'skins/Standard/mobile/icons/icon_ipad_x2.png',
|
||||
'skins/Standard/mobile/icons/icon_iphone_x1.png','skins/Standard/mobile/icons/icon_iphone_x2.png']),
|
||||
('skins/Standard/smartphone', ['skins/Standard/smartphone/barometer.html.tmpl', 'skins/Standard/smartphone/custom.js',
|
||||
'skins/Standard/smartphone/humidity.html.tmpl', 'skins/Standard/smartphone/index.html.tmpl',
|
||||
'skins/Standard/smartphone/radar.html.tmpl', 'skins/Standard/smartphone/rain.html.tmpl',
|
||||
'skins/Standard/smartphone/temp_outside.html.tmpl', 'skins/Standard/smartphone/wind.html.tmpl']),
|
||||
('skins/Standard/smartphone/icons',['skins/Standard/smartphone/icons/icon_ipad_x1.png', 'skins/Standard/smartphone/icons/icon_ipad_x2.png',
|
||||
'skins/Standard/smartphone/icons/icon_iphone_x1.png','skins/Standard/smartphone/icons/icon_iphone_x2.png']),
|
||||
('skins/Standard', ['skins/Standard/favicon.ico',
|
||||
'skins/Standard/mobile.css', 'skins/Standard/mobile.html.tmpl',
|
||||
'skins/Standard/index.html.tmpl', 'skins/Standard/month.html.tmpl',
|
||||
|
||||
@@ -309,7 +309,8 @@
|
||||
fast, and easy to understand by leveraging modern software concepts.
|
||||
</p>
|
||||
<p><a href="RSS/weewx_rss.xml">RSS feed</a></p>
|
||||
<p><a href="mobile/index.html">Mobile formatted</a></p>
|
||||
<p><a href="mobile.html">Mobile formatted</a></p>
|
||||
<p><a href="smartphone/index.html">Smartphone formatted</a></p>
|
||||
<p>Weewx uptime: $station.uptime<br/>
|
||||
Server uptime: $station.os_uptime<br/>
|
||||
weewx v$station.version</p>
|
||||
|
||||
@@ -244,22 +244,25 @@
|
||||
template = RSS/weewx_rss.xml.tmpl
|
||||
|
||||
[[[Mobile]]]
|
||||
template = mobile/index.html.tmpl
|
||||
template = mobile.html.tmpl
|
||||
|
||||
[[[MobileSmartphone]]]
|
||||
template = smartphone/index.html.tmpl
|
||||
|
||||
[[[MobileTempOutside]]]
|
||||
template = mobile/temp_outside.html.tmpl
|
||||
template = smartphone/temp_outside.html.tmpl
|
||||
|
||||
[[[MobileRain]]]
|
||||
template = mobile/rain.html.tmpl
|
||||
template = smartphone/rain.html.tmpl
|
||||
|
||||
[[[MobileBarometer]]]
|
||||
template = mobile/barometer.html.tmpl
|
||||
template = smartphone/barometer.html.tmpl
|
||||
|
||||
[[[MobileWind]]]
|
||||
template = mobile/wind.html.tmpl
|
||||
template = smartphone/wind.html.tmpl
|
||||
|
||||
[[[MobileRadar]]]
|
||||
template = mobile/radar.html.tmpl
|
||||
template = smartphone/radar.html.tmpl
|
||||
|
||||
############################################################################################
|
||||
|
||||
@@ -270,7 +273,7 @@
|
||||
#
|
||||
|
||||
# List of files that are to be copied at the first invocation of the generator only
|
||||
copy_once = backgrounds/*, weewx.css, mobile.css, favicon.ico, mobile/icons/*, mobile/custom.js
|
||||
copy_once = backgrounds/*, weewx.css, mobile.css, favicon.ico, smartphone/icons/*, smartphone/custom.js
|
||||
|
||||
# List of files to be copied every time:
|
||||
# copy_always =
|
||||
|
||||
|
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 4.7 KiB |
|
Before Width: | Height: | Size: 7.0 KiB After Width: | Height: | Size: 7.0 KiB |
|
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 4.3 KiB |
|
Before Width: | Height: | Size: 6.0 KiB After Width: | Height: | Size: 6.0 KiB |
@@ -29,7 +29,7 @@
|
||||
|
||||
<ul data-role="listview" data-inset="true" data-divider-theme="b">
|
||||
<li><a href="radar.html">Radar</a></li>
|
||||
<li><a href="../index.html" data-rel="external">Big page</a></li>
|
||||
<li><a href="../index.html" rel="external">Big page</a></li>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
Reference in New Issue
Block a user