Version 1.7.2 Final

Further refactoring of code

VERSION

@@ -1 +1 @@
-Raspi-Sump Version 1.7.2rc1
+Raspi-Sump Version 1.7.2

bin/rsump.py

@@ -14,15 +14,20 @@
 
 config = configparser.RawConfigParser()
 user = os.getlogin()
-config.read('/home/' + user + '/raspi-sump/raspisump.conf')
-reading_interval = config.getint('pit', 'reading_interval')
+config.read("/home/" + user + "/raspi-sump/raspisump.conf")
+reading_interval = config.getint("pit", "reading_interval")
 
 if reading_interval == 0:
     try:
         reading.water_depth()
     except RuntimeError:
-        print("ERROR -- Cannot Access gpio pins.  Make sure user is part of the gpio group.")
-        log.log_event("error_log", "GPIO ERROR -- Cannot Access gpio pins.  Make sure user is part of the gpio group.")
+        print(
+            "ERROR -- Cannot Access gpio pins.  Make sure user is part of the gpio group."
+        )
+        log.log_event(
+            "error_log",
+            "GPIO ERROR -- Cannot Access gpio pins.  Make sure user is part of the gpio group.",
+        )
 else:
     while True:
         reading.water_depth()

bin/rsumpchart.py

@@ -13,12 +13,11 @@
 
 user = os.getlogin()
 
+
 def main():
     """Initiate todaychart.py module to graph sump pit activity."""
-    csv_file = "/home/" + user + "/raspi-sump/csv/waterlevel-{}.csv".format(
-        time.strftime("%Y%m%d")
-    )
-    filename = "/home/" + user + "/raspi-sump/charts/today.png"
+    csv_file = f"/home/{user}/raspi-sump/csv/waterlevel-{time.strftime('%Y%m%d')}.csv"
+    filename = f"/home/{user}/raspi-sump/charts/today.png"
     todaychart.graph(csv_file, filename)
 
 

bin/rsumpmonitor.py

@@ -11,10 +11,11 @@
 
 
 def main():
-    '''run checkpid.py module to restart Raspi-Sump if the rsump.py process is
-    stopped or has spawned multiple processes.'''
-    process = '/usr/local/bin/rsump.py'
+    """run checkpid.py module to restart Raspi-Sump if the rsump.py process is
+    stopped or has spawned multiple processes."""
+    process = "/usr/local/bin/rsump.py"
     checkpid.check_pid(process)
 
+
 if __name__ == "__main__":
     main()

bin/rsumpwebchart.py

@@ -13,15 +13,17 @@
 
 user = os.getlogin()
 
+
 def main():
-    '''Pass variables to webchart.py'''
-    year = time.strftime('%Y')
-    month = time.strftime('%m')
-    today = time.strftime('%Y%m%d')
-    homedir = '/home/' + user + "/raspi-sump/"
+    """Pass variables to webchart.py"""
+    year = time.strftime("%Y")
+    month = time.strftime("%m")
+    today = time.strftime("%Y%m%d")
+    homedir = "/home/" + user + "/raspi-sump/"
     webchart.create_folders(year, month, homedir)
     webchart.create_chart(homedir)
     webchart.copy_chart(year, month, today, homedir)
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     main()

changelog

@@ -1,5 +1,12 @@
 Raspi-Sump Changelog
 ====================
+Version 1.7.2
+Note: No new functionality in this release.  Simply a refactoring of code and
+a change to way code is tested.  Optional Upgrade.
+- Refactored code to use fstrings instead of .format for strings
+- Migrated to Unittests from Nose
+- Other refactoring for tests
+
 Version 1.7.1
 - Fixed bug in date autoformatters on todaychart.py.  Should have proper date settings now (HH:MM:SS)
 

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup
 import os
 
-version = "1.7.2rc1"
+version = "1.7.2"
 user = os.getlogin()
 
 homedir = "/home/" + user + "/raspi-sump/"