Final 0.6.1 beta commit

.gitignore

@@ -123,5 +123,4 @@ storage/config.ini
 storage/versioninfo.txt
 
 # DS Store file
-.DS_Store
 *.DS_Store

CHANGELOG.md

@@ -17,7 +17,7 @@ The changelog will now NOT BE used for tracking what needs to get done, and not
     * Docs folder for uh, documents.
 * Adds the option to force a scheme on Geopy (HTTP or HTTPS)
 
-## version 0.6.1 beta - Performing QA - Should be released by 7/31/2017
+## version 0.6.1 beta - Released on 7/31/2017
 **NEW FEATURES/REMOVALS**
 * Adds caching and refreshing to PyWeather. After a user-defined amount of time, a cache will expire for certain components of PyWeather, prompting a re-fetch of data. A manual refresh option will also get added, in which a flag is enabled to refresh the cache.
 * Removed the dependency on geocoder, and by extension, removed the unnecessary reverse geocoder, and 
@@ -31,8 +31,8 @@ The changelog will now NOT BE used for tracking what needs to get done, and not
 * PyWeather Setup now validates your API key after you input it (and after the backup)
 * PyWeather Setup will now update PIP packages with user approval.
 * Geopy's scheme was changed to HTTP due to issues on OS X.
-* Added the ability to back up your API key to a specific directory in the keybackup.py script. - 0% done
 * Adds wind direction data to historical hourly.
+* Removed the keybackup script.
 
 **BUG FIXES**
 * Fixed a major bug where the PyWeather Git updater wouldn't, uh, fully update.

configupdate.py

@@ -30,7 +30,7 @@
     except:
         print("Failed to add the cache section. Does it exist?")
 
-    print("7 new configuration options have been added.",
+    print("9 new configuration options have been added.",
           "Details:",
           "- CACHE/alerts_cachedtime - Sets the cache time on alert data - Defaults to 5",
           "- CACHE/current_cachedtime - Sets the cache time on current data - Defaults to 10",
@@ -67,6 +67,9 @@
               "the full error. Along with that, please manually add the configuration entries",
               "as listed above, with their default values in your configuration file.",
               "Press enter to exit.")
+        input()
+        sys.exit()
+
     open("updater//versioninfo.txt", 'w').close()
     with open("updater//versioninfo.txt", 'a') as out:
         out.write("0.6.1 beta")

pyweather.py

@@ -163,7 +163,7 @@
 
 # Import logging, and set up the logger.
 import logging
-logger = logging.getLogger(name='pyweather_0.6beta')
+logger = logging.getLogger(name='pyweather_0.6.1beta')
 logformat = '%(asctime)s | %(levelname)s | %(message)s'
 logging.basicConfig(format=logformat)
 
@@ -177,7 +177,7 @@
     logger.setLevel(logging.CRITICAL)
 
 # List config options for those who have verbosity enabled.    
-logger.info("PyWeather 0.6 indev now starting.")
+logger.info("PyWeather 0.6.1 beta now starting.")
 logger.info("Configuration options are as follows: ")
 logger.debug("sundata_summary: %s ; almanac_summary: %s" %
              (sundata_summary, almanac_summary))
@@ -404,7 +404,7 @@ def radar_clearImages():
 logger.info("Defining about variables...")
 about_buildnumber = "61"
 about_version = "0.6.1 beta"
-about_releasedate = "May 29, 2017"
+about_releasedate = "July 31, 2017"
 about_maindevelopers = "o355"
 logger.debug("about_buildnumber: %s ; about_version: %s" %
              (about_buildnumber, about_version))

setup.py

@@ -1,4 +1,4 @@
-# PyWeather Setup - version 0.6.0.1 beta
+# PyWeather Setup - version 0.6.1 beta
 # (c) 2017, o355, licensed under GNU GPL v3
 
 # Same deal as the main script.
@@ -33,7 +33,7 @@
 except:
     open('updater//versioninfo.txt', 'w').close()
     with open("updater//versioninfo.txt", 'a') as out:
-        out.write("0.6.0.1 beta")
+        out.write("0.6.1 beta")
         out.close()
 
 config = configparser.ConfigParser()
@@ -430,7 +430,7 @@ def printException_loggerwarn():
         "I'll start in a few seconds.", sep="\n")
         time.sleep(3)
         print("Downloading the installer...")
-        # We use the built-in
+        # We use the built-in urllib library, as some Python installs don't include requests.
         try:
             with urllib.request.urlopen('https://bootstrap.pypa.io/get-pip.py') as update_response, open('get-pip.py',
                                                                                                          'wb') as update_out_file:

storage/config_README.md

@@ -231,10 +231,10 @@ When doing this, custom changes to your config file will be overwritten. PyWeath
 **Default option: False**
 
 ## RADAR GUI section
-**Available in PyWeather 0.6 indev, and PyWeather 0.6.1 beta and above**
+**Available in PyWeather 0.6.1 beta and above**
 This section controls the GUI for displaying radar and other images.
 
-### gifsize
+### radar_imagesize
 This option allows you to control the size of the .gif image that is to be displayed.
 This option will only accept 5 sizes, as defined below
 (can't imagine how hard it'd be to code in every size ever. This is simpler, too)
@@ -251,6 +251,13 @@ Of course, on newer laptops with FHD screens, you can increase the resolution of
 
 **Default option: normal**
 
+## bypassconfirmation
+This option allows you to control if the warning about the radar being experimental can be bypassed.
+
+When this option is True, the confirmation is bypassed.
+
+**Default option: False**
+
 ## KEYBACKUP section
 This section allows you to control parts of the Key Backup script.
 
@@ -290,7 +297,7 @@ v1.1 = 110
 
 And so on and so forth.
 
-If a criticial hotfix needs to be applied (e.g. 0.5.2.1), the build number in such case would become 52.1.
+If a critical hotfix needs to be applied (e.g. 0.5.2.1), the build number in such case would become 52.1.
 
 **Default option: 52.1**
 
@@ -309,4 +316,58 @@ This option controls if your config file is provisioned. This mainly does nothin
 
 Changing this should do nothing, but keep it True just to be safe.
 
-**Default option: True**
+**Default option: True**
+
+## CACHE section
+**Available in PyWeather 0.6.1 beta and above**
+
+This section lets you control cache times for the new caching system, and a master switch.
+
+### enabled
+This option lets you control if the cache is enabled (True), or disabled (False)
+
+**Default option: True**
+
+### alerts_cachedtime
+This option lets you control how many minutes will pass until alerts data is refreshed.
+
+This option must be an integer or float.
+
+**Default option: 5**
+
+### current_cachedtime
+This option lets you control how many minutes will pass until current "currently" weather data is refreshed.
+
+This option must be an integer or float.
+
+**Default option: 10**
+
+### hourly_cachedtime
+This option lets you control how many minutes will pass until hourly weather data is refreshed.
+
+This option must be an integer or float.
+
+**Default option: 60**
+
+### forecast_cachedtime
+This option lets you control how many minutes will pass until forecast weather data is refreshed.
+
+Keeping this option at 60 is recommended, since forecasts can change rapidly.
+
+This option must be an integer or float.
+
+**Default option: 60**
+
+### almanac_cachedtime
+This option lets you control how many minutes will pass until almanac data is refreshed.
+
+This option must be an integer or float.
+
+**Default option: 240**
+
+### sundata_cachedtime
+This option lets you control how many minutes will pass until sunrise/sunset data is refreshed.
+
+This option must be an integer or float.
+
+**Default option: 480**

updater.py

@@ -119,8 +119,8 @@ def printException_loggerwarn():
 logger.debug("showReleaseNotes: %s" %
              (showReleaseNotes))
 
-buildnumber = 60.1
-buildversion = "0.6.0.1 beta"
+buildnumber = 61
+buildversion = "0.6.1 beta"
 
 logger.debug("buildnumber: %s ; buildversion: %s" %
              (buildnumber, buildversion))