Fixes and linting

Author: Gadgetoid

Makefile

@@ -1,5 +1,5 @@
-LIBRARY_VERSION=$(shell cat library/setup.py | grep version | awk -F"'" '{print $$2}')
-LIBRARY_NAME=$(shell cat library/setup.py | grep name | awk -F"'" '{print $$2}')
+LIBRARY_VERSION=$(shell cat library/setup.cfg | grep version | awk -F" = " '{print $$2}')
+LIBRARY_NAME=$(shell cat library/setup.cfg | grep name | awk -F" = " '{print $$2}')
 
 .PHONY: usage install uninstall
 usage:

examples/button.py

@@ -20,7 +20,6 @@
 @fanshim.on_press()
 def press_handler():
     print("Pressed")
-    was_held = False
 
 
 @fanshim.on_release()

examples/toggle.py

@@ -13,6 +13,7 @@
 
 fanshim = FANShim()
 
+
 def update_led(state):
     if state:
         fanshim.set_light(0, 255, 0)
@@ -25,6 +26,7 @@ def release_handler(was_held):
     state = fanshim.toggle_fan()
     update_led(state)
 
+
 try:
     update_led(fanshim.get_fan())
     signal.pause()

install.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-LIBRARY_VERSION=`cat library/setup.py | grep version | awk -F"'" '{print $2}'`
-LIBRARY_NAME=`cat library/setup.py | grep name | awk -F"'" '{print $2}'`
+LIBRARY_VERSION=`cat library/setup.cfg | grep version | awk -F" = " '{print $2}'`
+LIBRARY_NAME=`cat library/setup.cfg | grep name | awk -F" = " '{print $2}'`
 
 printf "$LIBRARY_NAME $LIBRARY_VERSION Python Library: Installer\n\n"
 

library/fanshim/__init__.py

@@ -9,13 +9,13 @@
 
 class FANShim():
     def __init__(self):
-        self._pin_fancontrol = 18 
+        self._pin_fancontrol = 18
         self._pin_button = 17
         self._button_press_handler = None
         self._button_release_handler = None
         self._button_hold_handler = None
         self._t_poll = None
-        
+
         atexit.register(self._cleanup)
 
         GPIO.setwarnings(False)
@@ -42,7 +42,7 @@ def stop(self):
 
     def on_press(self, handler=None):
         def attach_handler(handler):
-            self._button_press_handler =handler
+            self._button_press_handler = handler
 
         if handler is not None:
             attach_handler(handler)
@@ -69,7 +69,7 @@ def attach_handler(handler):
 
     def set_hold_time(self, hold_time):
         """Set the button hold time in seconds.
-        
+
         :param hold_time: Amount of time button must be held to trigger on_hold (in seconds)
 
         """
@@ -83,9 +83,9 @@ def toggle_fan(self):
 
     def set_fan(self, fan_state):
         """Set the fan on/off.
-        
+
         :param fan_state: True/False for on/off
-        
+
         """
         GPIO.output(self._pin_fancontrol, True if fan_state else False)
         return True if fan_state else False
@@ -125,4 +125,3 @@ def _run(self):
             last = current
 
             time.sleep(0.001)
-

library/setup.cfg

@@ -13,7 +13,7 @@ license = MIT
 # This includes the license file(s) in the wheel.
 # https://wheel.readthedocs.io/en/stable/user_guide.html#including-license-files-in-the-generated-wheel-file
 license_files = LICENSE.txt
-classifiers = 
+classifiers =
 	Development Status :: 4 - Beta
 	Operating System :: POSIX :: Linux
 	License :: OSI Approved :: MIT License

uninstall.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-LIBRARY_VERSION=`cat library/setup.py | grep version | awk -F"'" '{print $2}'`
-LIBRARY_NAME=`cat library/setup.py | grep name | awk -F"'" '{print $2}'`
+LIBRARY_VERSION=`cat library/setup.cfg | grep version | awk -F" = " '{print $2}'`
+LIBRARY_NAME=`cat library/setup.cfg | grep name | awk -F" = " '{print $2}'`
 
 printf "$LIBRARY_NAME $LIBRARY_VERSION Python Library: Uninstaller\n\n"