diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 2314d85c..00000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index 79ee123c..00000000 --- a/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/bin/weecfg/tests/expected/weewx43_user_expected.conf b/bin/weecfg/tests/expected/weewx43_user_expected.conf index 2dfa1cc9..0a50fe31 100644 --- a/bin/weecfg/tests/expected/weewx43_user_expected.conf +++ b/bin/weecfg/tests/expected/weewx43_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 = 4.6.2 +version = 4.7.0 ############################################################################## diff --git a/bin/weewx/__init__.py b/bin/weewx/__init__.py index c2e96b41..60f8f0a0 100644 --- a/bin/weewx/__init__.py +++ b/bin/weewx/__init__.py @@ -7,7 +7,7 @@ from __future__ import absolute_import import time -__version__="4.6.2" +__version__="4.7.0" # Holds the program launch time in unix epoch seconds: # Useful for calculating 'uptime.' diff --git a/docs/changes.txt b/docs/changes.txt index f8b395b0..1ce3f440 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -1,14 +1,12 @@ WeeWX change history -------------------- -4.7.0 MM/DD/YYYY +4.7.0 03/01/2022 Introduced new option "generate_once". If True, templates will be generated only on the first run of the reporting engine. Thanks to user Rich! PR #748. Added option wee_device --current for vantage. - -4.6.3 MM/DD/YYYY Fixed two typos in the Standard skin. Fixed spelling mistakes in the Norwegian translations. Thanks to Aslak! PR#746 diff --git a/docs/customizing.htm b/docs/customizing.htm index 745484e0..997ec987 100644 --- a/docs/customizing.htm +++ b/docs/customizing.htm @@ -44,7 +44,7 @@

-Version: 4.6 +Version: 4.7
WeeWX Customization Guide
diff --git a/docs/devnotes.htm b/docs/devnotes.htm index dff19a08..36bbe70b 100644 --- a/docs/devnotes.htm +++ b/docs/devnotes.htm @@ -47,7 +47,7 @@

-Version: 4.6 +Version: 4.7
Notes for Developers of the WeeWX Weather System
diff --git a/docs/hardware.htm b/docs/hardware.htm index 5fb771da..f62533cd 100644 --- a/docs/hardware.htm +++ b/docs/hardware.htm @@ -52,7 +52,7 @@

-Version: 4.6 +Version: 4.7
WeeWX Hardware Guide
diff --git a/docs/readme.htm b/docs/readme.htm index b8909274..c7d685db 100644 --- a/docs/readme.htm +++ b/docs/readme.htm @@ -26,7 +26,7 @@

-Version: 4.6 +Version: 4.7
WeeWX Documentation
diff --git a/docs/upgrading.htm b/docs/upgrading.htm index e368102e..6d12bf8b 100644 --- a/docs/upgrading.htm +++ b/docs/upgrading.htm @@ -80,7 +80,7 @@

-Version: 4.6 +Version: 4.7
WeeWX Upgrade Guide
diff --git a/docs/usersguide.htm b/docs/usersguide.htm index 8b92581a..edf1585b 100644 --- a/docs/usersguide.htm +++ b/docs/usersguide.htm @@ -47,7 +47,7 @@

-Version: 4.6 +Version: 4.7
User's Guide to WeeWX
diff --git a/docs/utilities.htm b/docs/utilities.htm index 56d34565..c78efbc4 100644 --- a/docs/utilities.htm +++ b/docs/utilities.htm @@ -49,7 +49,7 @@

-Version: 4.6 +Version: 4.7
WeeWX Utilities Guide
diff --git a/pkg/changelog.el b/pkg/changelog.el index 9f3a3d3a..f682abf3 100644 --- a/pkg/changelog.el +++ b/pkg/changelog.el @@ -1,3 +1,5 @@ +* Tue Mar 01 2022 Thomas Keffer (Author of weewx) - 4.7.0-1 +- new upstream release * Thu Feb 10 2022 Matthew Wall (weewx) - 4.6.2-1 - new upstream release * Thu Feb 10 2022 Matthew Wall (weewx) - 4.6.1-1 diff --git a/pkg/changelog.suse b/pkg/changelog.suse index a92b9c98..0148b7c8 100644 --- a/pkg/changelog.suse +++ b/pkg/changelog.suse @@ -1,3 +1,5 @@ +* Tue Mar 01 2022 Thomas Keffer (Author of weewx) - 4.7.0-1 +- new upstream release * Thu Feb 10 2022 Matthew Wall (weewx) - 4.6.2-1 - new upstream release * Thu Feb 10 2022 Matthew Wall (weewx) - 4.6.1-1 diff --git a/pkg/debian/changelog b/pkg/debian/changelog index 416abc8c..147edf6b 100644 --- a/pkg/debian/changelog +++ b/pkg/debian/changelog @@ -1,3 +1,6 @@ +weewx (4.7.0-1) unstable; urgency=low + * new upstream release + -- Thomas Keffer (Author of weewx) Tue, 01 Mar 2022 15:19:53 -0800 weewx (4.6.2-1) unstable; urgency=low * new upstream release -- Matthew Wall (weewx) Thu, 10 Feb 2022 22:15:26 -0500 diff --git a/setup.py b/setup.py index 769bc008..5d207884 100755 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ from distutils.command.install_lib import install_lib from distutils.core import setup from distutils.debug import DEBUG -VERSION = "4.6.2" +VERSION = "4.7.0" if sys.version_info < (2, 7): log.fatal('WeeWX requires Python V2.7 or greater.') diff --git a/skins/Ftp/skin.conf b/skins/Ftp/skin.conf index 77bdaba5..72ff5a8d 100644 --- a/skins/Ftp/skin.conf +++ b/skins/Ftp/skin.conf @@ -7,7 +7,7 @@ ############################################################################### SKIN_NAME = Ftp -SKIN_VERSION = 4.6.2 +SKIN_VERSION = 4.7.0 [Generators] generator_list = weewx.reportengine.FtpGenerator diff --git a/skins/Mobile/skin.conf b/skins/Mobile/skin.conf index a51a1340..d70aa652 100644 --- a/skins/Mobile/skin.conf +++ b/skins/Mobile/skin.conf @@ -1,7 +1,7 @@ # configuration file for Mobile skin SKIN_NAME = Mobile -SKIN_VERSION = 4.6.2 +SKIN_VERSION = 4.7.0 [Extras] # Set this URL to display a radar image diff --git a/skins/Rsync/skin.conf b/skins/Rsync/skin.conf index 90410714..6a9f7a5c 100644 --- a/skins/Rsync/skin.conf +++ b/skins/Rsync/skin.conf @@ -8,7 +8,7 @@ ############################################################################### SKIN_NAME = Rsync -SKIN_VERSION = 4.6.2 +SKIN_VERSION = 4.7.0 [Generators] generator_list = weewx.reportengine.RsyncGenerator diff --git a/skins/Seasons/skin.conf b/skins/Seasons/skin.conf index 00bcb38e..9c33cc0c 100644 --- a/skins/Seasons/skin.conf +++ b/skins/Seasons/skin.conf @@ -5,7 +5,7 @@ ############################################################################### SKIN_NAME = Seasons -SKIN_VERSION = 4.6.2 +SKIN_VERSION = 4.7.0 ############################################################################### diff --git a/skins/Smartphone/skin.conf b/skins/Smartphone/skin.conf index 55dcb9a5..12c49d61 100644 --- a/skins/Smartphone/skin.conf +++ b/skins/Smartphone/skin.conf @@ -1,7 +1,7 @@ # configuration file for Smartphone skin SKIN_NAME = Smartphone -SKIN_VERSION = 4.6.2 +SKIN_VERSION = 4.7.0 [Extras] # Set this URL to display a radar image diff --git a/skins/Standard/skin.conf b/skins/Standard/skin.conf index a5311a0f..c89edf94 100644 --- a/skins/Standard/skin.conf +++ b/skins/Standard/skin.conf @@ -5,7 +5,7 @@ ############################################################################### SKIN_NAME = Standard -SKIN_VERSION = 4.6.2 +SKIN_VERSION = 4.7.0 ############################################################################### diff --git a/weewx.conf b/weewx.conf index a674278e..621ba6d7 100644 --- a/weewx.conf +++ b/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 = 4.6.2 +version = 4.7.0 ##############################################################################