Test tweaks and linting

I've re-written the tests to use conftest.py to set up and tear down mock modules via fixtures.

I have also linted the examples, removing redundant linebreaks, commenting out unused variables and attempting to simplify long lines.

diff --git a/examples/all-in-one-no-pm.py b/examples/all-in-one-no-pm.py
index d9b1069cf6ab67a9439df7fb3a5f994f55d217b2..de8ab067479fd08224853e1fb5a2703f026df28c 100755 (executable)
--- a/examples/all-in-one-no-pm.py
+++ b/examples/all-in-one-no-pm.py
@@ -67,8 +67,9 @@ def display_text(variable, data, unit):
     # Maintain length of list
     values[variable] = values[variable][1:] + [data]
     # Scale the values for the variable between 0 and 1
     # Maintain length of list
     values[variable] = values[variable][1:] + [data]
     # Scale the values for the variable between 0 and 1

-    colours = [(v - min(values[variable]) + 1) / (max(values[variable])
-               - min(values[variable]) + 1) for v in values[variable]]
+    vmin = min(values[variable])
+    vmax = max(values[variable])
+    colours = [(v - vmin + 1) / (vmax - vmin + 1) for v in values[variable]]

     # Format the variable name and value
     message = "{}: {:.1f} {}".format(variable[:4], data, unit)
     logging.info(message)
     # Format the variable name and value
     message = "{}: {:.1f} {}".format(variable[:4], data, unit)
     logging.info(message)


@@ -76,14 +77,12 @@ def display_text(variable, data, unit):
     for i in range(len(colours)):
         # Convert the values to colours from red to blue
         colour = (1.0 - colours[i]) * 0.6
     for i in range(len(colours)):
         # Convert the values to colours from red to blue
         colour = (1.0 - colours[i]) * 0.6

-        r, g, b = [int(x * 255.0) for x in colorsys.hsv_to_rgb(colour,
-                   1.0, 1.0)]
+        r, g, b = [int(x * 255.0) for x in colorsys.hsv_to_rgb(colour, 1.0, 1.0)]

         # Draw a 1-pixel wide rectangle of colour
         # Draw a 1-pixel wide rectangle of colour

-        draw.rectangle((i, top_pos, i+1, HEIGHT), (r, g, b))
+        draw.rectangle((i, top_pos, i + 1, HEIGHT), (r, g, b))

         # Draw a line graph in black
         # Draw a line graph in black

-        line_y = HEIGHT - (top_pos + (colours[i] * (HEIGHT - top_pos)))\
-                 + top_pos
-        draw.rectangle((i, line_y, i+1, line_y+1), (0, 0, 0))
+        line_y = HEIGHT - (top_pos + (colours[i] * (HEIGHT - top_pos))) + top_pos
+        draw.rectangle((i, line_y, i + 1, line_y + 1), (0, 0, 0))

     # Write the text at the top in black
     draw.text((0, 0), message, font=font, fill=(0, 0, 0))
     st7735.display(img)
     # Write the text at the top in black
     draw.text((0, 0), message, font=font, fill=(0, 0, 0))
     st7735.display(img)

diff --git a/examples/all-in-one.py b/examples/all-in-one.py
index c0423e6d6a54f3cfaf6dcbf880edc03eda0f72d1..6dda60779f2f354c7500e9d06e8ab8d6b1fbdba3 100755 (executable)
--- a/examples/all-in-one.py
+++ b/examples/all-in-one.py
@@ -2,7 +2,6 @@
 
 import time
 import colorsys
 
 import time
 import colorsys

-import os

 import sys
 import ST7735
 try:
 import sys
 import ST7735
 try:


@@ -72,8 +71,9 @@ def display_text(variable, data, unit):
     # Maintain length of list
     values[variable] = values[variable][1:] + [data]
     # Scale the values for the variable between 0 and 1
     # Maintain length of list
     values[variable] = values[variable][1:] + [data]
     # Scale the values for the variable between 0 and 1

-    colours = [(v - min(values[variable]) + 1) / (max(values[variable])
-               - min(values[variable]) + 1) for v in values[variable]]
+    vmin = min(values[variable])
+    vmax = max(values[variable])
+    colours = [(v - vmin + 1) / (vmax - vmin + 1) for v in values[variable]]

     # Format the variable name and value
     message = "{}: {:.1f} {}".format(variable[:4], data, unit)
     logging.info(message)
     # Format the variable name and value
     message = "{}: {:.1f} {}".format(variable[:4], data, unit)
     logging.info(message)


@@ -81,14 +81,12 @@ def display_text(variable, data, unit):
     for i in range(len(colours)):
         # Convert the values to colours from red to blue
         colour = (1.0 - colours[i]) * 0.6
     for i in range(len(colours)):
         # Convert the values to colours from red to blue
         colour = (1.0 - colours[i]) * 0.6

-        r, g, b = [int(x * 255.0) for x in colorsys.hsv_to_rgb(colour,
-                   1.0, 1.0)]
+        r, g, b = [int(x * 255.0) for x in colorsys.hsv_to_rgb(colour, 1.0, 1.0)]

         # Draw a 1-pixel wide rectangle of colour
         # Draw a 1-pixel wide rectangle of colour

-        draw.rectangle((i, top_pos, i+1, HEIGHT), (r, g, b))
+        draw.rectangle((i, top_pos, i + 1, HEIGHT), (r, g, b))

         # Draw a line graph in black
         # Draw a line graph in black

-        line_y = HEIGHT - (top_pos + (colours[i] * (HEIGHT - top_pos)))\
-                 + top_pos
-        draw.rectangle((i, line_y, i+1, line_y+1), (0, 0, 0))
+        line_y = HEIGHT - (top_pos + (colours[i] * (HEIGHT - top_pos))) + top_pos
+        draw.rectangle((i, line_y, i + 1, line_y + 1), (0, 0, 0))

     # Write the text at the top in black
     draw.text((0, 0), message, font=font, fill=(0, 0, 0))
     st7735.display(img)
     # Write the text at the top in black
     draw.text((0, 0), message, font=font, fill=(0, 0, 0))
     st7735.display(img)

diff --git a/examples/combined.py b/examples/combined.py
index c2fd397e2b20205004be636bbc18291295859987..4b8fbddaf6db117b0daf72d672a5db22b9786ea7 100755 (executable)
--- a/examples/combined.py
+++ b/examples/combined.py
@@ -2,7 +2,6 @@
 
 import time
 import colorsys
 
 import time
 import colorsys

-import os

 import sys
 import ST7735
 try:
 import sys
 import ST7735
 try:


@@ -107,23 +106,23 @@ units = ["C",
 # with NO WARRANTY. The authors of this example code claim
 # NO RESPONSIBILITY if reliance on the following values or this
 # code in general leads to ANY DAMAGES or DEATH.
 # with NO WARRANTY. The authors of this example code claim
 # NO RESPONSIBILITY if reliance on the following values or this
 # code in general leads to ANY DAMAGES or DEATH.

-limits = [[4,18,28,35],
-          [250,650,1013.25,1015],
-          [20,30,60,70],
-          [-1,-1,30000,100000],
-          [-1,-1,40,50],
-          [-1,-1,450,550],
-          [-1,-1,200,300],
-          [-1,-1,50,100],
-          [-1,-1,50,100],
-          [-1,-1,50,100]]
+limits = [[4, 18, 28, 35],
+          [250, 650, 1013.25, 1015],
+          [20, 30, 60, 70],
+          [-1, -1, 30000, 100000],
+          [-1, -1, 40, 50],
+          [-1, -1, 450, 550],
+          [-1, -1, 200, 300],
+          [-1, -1, 50, 100],
+          [-1, -1, 50, 100],
+          [-1, -1, 50, 100]]

 
 # RGB palette for values on the combined screen
 
 # RGB palette for values on the combined screen

-palette = [(0,0,255),           # Dangerously Low
-           (0,255,255),         # Low
-           (0,255,0),           # Normal
-           (255,255,0),         # High
-           (255,0,0)]           # Dangerously High
+palette = [(0, 0, 255),           # Dangerously Low
+           (0, 255, 255),         # Low
+           (0, 255, 0),           # Normal
+           (255, 255, 0),         # High
+           (255, 0, 0)]           # Dangerously High

 
 values = {}
 
 
 values = {}
 


@@ -133,8 +132,9 @@ def display_text(variable, data, unit):
     # Maintain length of list
     values[variable] = values[variable][1:] + [data]
     # Scale the values for the variable between 0 and 1
     # Maintain length of list
     values[variable] = values[variable][1:] + [data]
     # Scale the values for the variable between 0 and 1

-    colours = [(v - min(values[variable]) + 1) / (max(values[variable])
-               - min(values[variable]) + 1) for v in values[variable]]
+    vmin = min(values[variable])
+    vmax = max(values[variable])
+    colours = [(v - vmin + 1) / (vmax - vmin + 1) for v in values[variable]]

     # Format the variable name and value
     message = "{}: {:.1f} {}".format(variable[:4], data, unit)
     logging.info(message)
     # Format the variable name and value
     message = "{}: {:.1f} {}".format(variable[:4], data, unit)
     logging.info(message)


@@ -142,18 +142,17 @@ def display_text(variable, data, unit):
     for i in range(len(colours)):
         # Convert the values to colours from red to blue
         colour = (1.0 - colours[i]) * 0.6
     for i in range(len(colours)):
         # Convert the values to colours from red to blue
         colour = (1.0 - colours[i]) * 0.6

-        r, g, b = [int(x * 255.0) for x in colorsys.hsv_to_rgb(colour,
-                   1.0, 1.0)]
+        r, g, b = [int(x * 255.0) for x in colorsys.hsv_to_rgb(colour, 1.0, 1.0)]

         # Draw a 1-pixel wide rectangle of colour
         # Draw a 1-pixel wide rectangle of colour

-        draw.rectangle((i, top_pos, i+1, HEIGHT), (r, g, b))
+        draw.rectangle((i, top_pos, i + 1, HEIGHT), (r, g, b))

         # Draw a line graph in black
         # Draw a line graph in black

-        line_y = HEIGHT - (top_pos + (colours[i] * (HEIGHT - top_pos)))\
-                 + top_pos
-        draw.rectangle((i, line_y, i+1, line_y+1), (0, 0, 0))
+        line_y = HEIGHT - (top_pos + (colours[i] * (HEIGHT - top_pos))) + top_pos
+        draw.rectangle((i, line_y, i + 1, line_y + 1), (0, 0, 0))

     # Write the text at the top in black
     draw.text((0, 0), message, font=font, fill=(0, 0, 0))
     st7735.display(img)
 
     # Write the text at the top in black
     draw.text((0, 0), message, font=font, fill=(0, 0, 0))
     st7735.display(img)
 

+

 # Saves the data to be used in the graphs later and prints to the log
 def save_data(idx, data):
     variable = variables[idx]
 # Saves the data to be used in the graphs later and prints to the log
 def save_data(idx, data):
     variable = variables[idx]


@@ -168,24 +167,23 @@ def save_data(idx, data):
 def display_everything():
     draw.rectangle((0, 0, WIDTH, HEIGHT), (0, 0, 0))
     column_count = 2
 def display_everything():
     draw.rectangle((0, 0, WIDTH, HEIGHT), (0, 0, 0))
     column_count = 2

-    row_count = (len(variables)/column_count)
+    row_count = (len(variables) / column_count)

     for i in range(len(variables)):
         variable = variables[i]
         data_value = values[variable][-1]
         unit = units[i]
     for i in range(len(variables)):
         variable = variables[i]
         data_value = values[variable][-1]
         unit = units[i]

-        x = x_offset + ((WIDTH/column_count) * (i / row_count))
-        y = y_offset + ((HEIGHT/row_count) * (i % row_count))
+        x = x_offset + ((WIDTH / column_count) * (i / row_count))
+        y = y_offset + ((HEIGHT / row_count) * (i % row_count))

         message = "{}: {:.1f} {}".format(variable[:4], data_value, unit)
         lim = limits[i]
         rgb = palette[0]
         for j in range(len(lim)):
             if data_value > lim[j]:
         message = "{}: {:.1f} {}".format(variable[:4], data_value, unit)
         lim = limits[i]
         rgb = palette[0]
         for j in range(len(lim)):
             if data_value > lim[j]:

-                rgb = palette[j+1]
+                rgb = palette[j + 1]

         draw.text((x, y), message, font=smallfont, fill=rgb)
     st7735.display(img)
 
 
         draw.text((x, y), message, font=smallfont, fill=rgb)
     st7735.display(img)
 
 

-

 # Get the temperature of the CPU for compensation
 def get_cpu_temperature():
     process = Popen(['vcgencmd', 'measure_temp'], stdout=PIPE, universal_newlines=True)
 # Get the temperature of the CPU for compensation
 def get_cpu_temperature():
     process = Popen(['vcgencmd', 'measure_temp'], stdout=PIPE, universal_newlines=True)


@@ -193,156 +191,158 @@ def get_cpu_temperature():
     return float(output[output.index('=') + 1:output.rindex("'")])
 
 
     return float(output[output.index('=') + 1:output.rindex("'")])
 
 

-# Tuning factor for compensation. Decrease this number to adjust the
-# temperature down, and increase to adjust up
-factor = 2.25
-
-cpu_temps = [get_cpu_temperature()] * 5
-
-delay = 0.5  # Debounce the proximity tap
-mode = 10    # The starting mode
-last_page = 0
-light = 1
+def main():
+    # Tuning factor for compensation. Decrease this number to adjust the
+    # temperature down, and increase to adjust up
+    factor = 2.25
+
+    cpu_temps = [get_cpu_temperature()] * 5
+
+    delay = 0.5  # Debounce the proximity tap
+    mode = 10    # The starting mode
+    last_page = 0
+
+    for v in variables:
+        values[v] = [1] * WIDTH
+
+    # The main loop
+    try:
+        while True:
+            proximity = ltr559.get_proximity()
+
+            # If the proximity crosses the threshold, toggle the mode
+            if proximity > 1500 and time.time() - last_page > delay:
+                mode += 1
+                mode %= (len(variables) + 1)
+                last_page = time.time()
+
+            # One mode for each variable
+            if mode == 0:
+                # variable = "temperature"
+                unit = "C"
+                cpu_temp = get_cpu_temperature()
+                # Smooth out with some averaging to decrease jitter
+                cpu_temps = cpu_temps[1:] + [cpu_temp]
+                avg_cpu_temp = sum(cpu_temps) / float(len(cpu_temps))
+                raw_temp = bme280.get_temperature()
+                data = raw_temp - ((avg_cpu_temp - raw_temp) / factor)
+                display_text(variables[mode], data, unit)

 
 

-for v in variables:
-    values[v] = [1] * WIDTH
+            if mode == 1:
+                # variable = "pressure"
+                unit = "hPa"
+                data = bme280.get_pressure()
+                display_text(variables[mode], data, unit)

 
 

-# The main loop
-try:
-    while True:
-        proximity = ltr559.get_proximity()
-
-        # If the proximity crosses the threshold, toggle the mode
-        if proximity > 1500 and time.time() - last_page > delay:
-            mode += 1
-            mode %= (len(variables)+1)
-            last_page = time.time()
-
-        # One mode for each variable
-        if mode == 0:
-            # variable = "temperature"
-            unit = "C"
-            cpu_temp = get_cpu_temperature()
-            # Smooth out with some averaging to decrease jitter
-            cpu_temps = cpu_temps[1:] + [cpu_temp]
-            avg_cpu_temp = sum(cpu_temps) / float(len(cpu_temps))
-            raw_temp = bme280.get_temperature()
-            data = raw_temp - ((avg_cpu_temp - raw_temp) / factor)
-            display_text(variables[mode], data, unit)
-
-        if mode == 1:
-            # variable = "pressure"
-            unit = "hPa"
-            data = bme280.get_pressure()
-            display_text(variables[mode], data, unit)
-
-        if mode == 2:
-            # variable = "humidity"
-            unit = "%"
-            data = bme280.get_humidity()
-            display_text(variables[mode], data, unit)
-
-        if mode == 3:
-            # variable = "light"
-            unit = "Lux"
-            if proximity < 10:
-                data = ltr559.get_lux()
-            else:
-                data = 1
-            display_text(variables[mode], data, unit)
-
-        if mode == 4:
-            # variable = "oxidised"
-            unit = "kO"
-            data = gas.read_all()
-            data = data.oxidising / 1000
-            display_text(variables[mode], data, unit)
-
-        if mode == 5:
-            # variable = "reduced"
-            unit = "kO"
-            data = gas.read_all()
-            data = data.reducing / 1000
-            display_text(variables[mode], data, unit)
-
-        if mode == 6:
-            # variable = "nh3"
-            unit = "kO"
-            data = gas.read_all()
-            data = data.nh3 / 1000
-            display_text(variables[mode], data, unit)
-
-        if mode == 7:
-            # variable = "pm1"
-            unit = "ug/m3"
-            try:
-                data = pms5003.read()
-            except pmsReadTimeoutError:
-                logging.warn("Failed to read PMS5003")
-            else:
-                data = float(data.pm_ug_per_m3(1.0))
+            if mode == 2:
+                # variable = "humidity"
+                unit = "%"
+                data = bme280.get_humidity()

                 display_text(variables[mode], data, unit)
 
                 display_text(variables[mode], data, unit)
 

-        if mode == 8:
-            # variable = "pm25"
-            unit = "ug/m3"
-            try:
-                data = pms5003.read()
-            except pmsReadTimeoutError:
-                logging.warn("Failed to read PMS5003")
-            else:
-                data = float(data.pm_ug_per_m3(2.5))
+            if mode == 3:
+                # variable = "light"
+                unit = "Lux"
+                if proximity < 10:
+                    data = ltr559.get_lux()
+                else:
+                    data = 1

                 display_text(variables[mode], data, unit)
 
                 display_text(variables[mode], data, unit)
 

-        if mode == 9:
-            # variable = "pm10"
-            unit = "ug/m3"
-            try:
-                data = pms5003.read()
-            except pmsReadTimeoutError:
-                logging.warn("Failed to read PMS5003")
-            else:
-                data = float(data.pm_ug_per_m3(10))
+            if mode == 4:
+                # variable = "oxidised"
+                unit = "kO"
+                data = gas.read_all()
+                data = data.oxidising / 1000

                 display_text(variables[mode], data, unit)
                 display_text(variables[mode], data, unit)

-        if mode == 10:
-            # Everything on one screen
-            cpu_temp = get_cpu_temperature()
-            # Smooth out with some averaging to decrease jitter
-            cpu_temps = cpu_temps[1:] + [cpu_temp]
-            avg_cpu_temp = sum(cpu_temps) / float(len(cpu_temps))
-            raw_temp = bme280.get_temperature()
-            raw_data = raw_temp - ((avg_cpu_temp - raw_temp) / factor)
-            save_data(0, raw_data)
-            display_everything()
-            raw_data = bme280.get_pressure()
-            save_data(1, raw_data)
-            display_everything()
-            raw_data = bme280.get_humidity()
-            save_data(2, raw_data)
-            if proximity < 10:
-                raw_data = ltr559.get_lux()
-            else:
-                raw_data = 1
-            save_data(3, raw_data)
-            display_everything()
-            gas_data = gas.read_all()
-            save_data(4, gas_data.oxidising / 1000)
-            save_data(5, gas_data.reducing / 1000)
-            save_data(6, gas_data.nh3 / 1000)
-            display_everything()
-            pms_data = None
-            try:
-                pms_data = pms5003.read()
-            except pmsReadTimeoutError:
-                logging.warn("Failed to read PMS5003")
-            else:
-                save_data(7, float(pms_data.pm_ug_per_m3(1.0)))
-                save_data(8, float(pms_data.pm_ug_per_m3(2.5)))
-                save_data(9, float(pms_data.pm_ug_per_m3(10)))
-                display_everything()

 
 

+            if mode == 5:
+                # variable = "reduced"
+                unit = "kO"
+                data = gas.read_all()
+                data = data.reducing / 1000
+                display_text(variables[mode], data, unit)

 
 

+            if mode == 6:
+                # variable = "nh3"
+                unit = "kO"
+                data = gas.read_all()
+                data = data.nh3 / 1000
+                display_text(variables[mode], data, unit)

 
 

-# Exit cleanly
-except KeyboardInterrupt:
-    sys.exit(0)
+            if mode == 7:
+                # variable = "pm1"
+                unit = "ug/m3"
+                try:
+                    data = pms5003.read()
+                except pmsReadTimeoutError:
+                    logging.warn("Failed to read PMS5003")
+                else:
+                    data = float(data.pm_ug_per_m3(1.0))
+                    display_text(variables[mode], data, unit)
+
+            if mode == 8:
+                # variable = "pm25"
+                unit = "ug/m3"
+                try:
+                    data = pms5003.read()
+                except pmsReadTimeoutError:
+                    logging.warn("Failed to read PMS5003")
+                else:
+                    data = float(data.pm_ug_per_m3(2.5))
+                    display_text(variables[mode], data, unit)
+
+            if mode == 9:
+                # variable = "pm10"
+                unit = "ug/m3"
+                try:
+                    data = pms5003.read()
+                except pmsReadTimeoutError:
+                    logging.warn("Failed to read PMS5003")
+                else:
+                    data = float(data.pm_ug_per_m3(10))
+                    display_text(variables[mode], data, unit)
+            if mode == 10:
+                # Everything on one screen
+                cpu_temp = get_cpu_temperature()
+                # Smooth out with some averaging to decrease jitter
+                cpu_temps = cpu_temps[1:] + [cpu_temp]
+                avg_cpu_temp = sum(cpu_temps) / float(len(cpu_temps))
+                raw_temp = bme280.get_temperature()
+                raw_data = raw_temp - ((avg_cpu_temp - raw_temp) / factor)
+                save_data(0, raw_data)
+                display_everything()
+                raw_data = bme280.get_pressure()
+                save_data(1, raw_data)
+                display_everything()
+                raw_data = bme280.get_humidity()
+                save_data(2, raw_data)
+                if proximity < 10:
+                    raw_data = ltr559.get_lux()
+                else:
+                    raw_data = 1
+                save_data(3, raw_data)
+                display_everything()
+                gas_data = gas.read_all()
+                save_data(4, gas_data.oxidising / 1000)
+                save_data(5, gas_data.reducing / 1000)
+                save_data(6, gas_data.nh3 / 1000)
+                display_everything()
+                pms_data = None
+                try:
+                    pms_data = pms5003.read()
+                except pmsReadTimeoutError:
+                    logging.warn("Failed to read PMS5003")
+                else:
+                    save_data(7, float(pms_data.pm_ug_per_m3(1.0)))
+                    save_data(8, float(pms_data.pm_ug_per_m3(2.5)))
+                    save_data(9, float(pms_data.pm_ug_per_m3(10)))
+                    display_everything()
+
+    # Exit cleanly
+    except KeyboardInterrupt:
+        sys.exit(0)
+
+
+if __name__ == "__main__":
+    main()

diff --git a/examples/luftdaten.py b/examples/luftdaten.py
index d2d656216b77143f67f5a2074b78c25465808474..84f111776c6f65c0e3d0b5e39b75c8d31625d60a 100755 (executable)
--- a/examples/luftdaten.py
+++ b/examples/luftdaten.py
@@ -115,32 +115,35 @@ def send_to_luftdaten(values, id):
     pm_values = dict(i for i in values.items() if i[0].startswith("P"))
     temp_values = dict(i for i in values.items() if not i[0].startswith("P"))
 
     pm_values = dict(i for i in values.items() if i[0].startswith("P"))
     temp_values = dict(i for i in values.items() if not i[0].startswith("P"))
 

-    resp_1 = requests.post("https://api.luftdaten.info/v1/push-sensor-data/",
-             json={
-                 "software_version": "enviro-plus 0.0.1",
-                 "sensordatavalues": [{"value_type": key, "value": val} for
-                                      key, val in pm_values.items()]
-             },
-             headers={
-                 "X-PIN":    "1",
-                 "X-Sensor": id,
-                 "Content-Type": "application/json",
-                 "cache-control": "no-cache"
-             }
+    pm_values_json = [{"value_type": key, "value": val} for key, val in pm_values.items()]
+    temp_values_json = [{"value_type": key, "value": val} for key, val in temp_values.items()]
+
+    resp_1 = requests.post(
+        "https://api.luftdaten.info/v1/push-sensor-data/",
+        json={
+            "software_version": "enviro-plus 0.0.1",
+            "sensordatavalues": pm_values_json
+        },
+        headers={
+            "X-PIN": "1",
+            "X-Sensor": id,
+            "Content-Type": "application/json",
+            "cache-control": "no-cache"
+        }

     )
 
     )
 

-    resp_2 = requests.post("https://api.luftdaten.info/v1/push-sensor-data/",
-             json={
-                 "software_version": "enviro-plus 0.0.1",
-                 "sensordatavalues": [{"value_type": key, "value": val} for
-                                      key, val in temp_values.items()]
-             },
-             headers={
-                 "X-PIN":    "11",
-                 "X-Sensor": id,
-                 "Content-Type": "application/json",
-                 "cache-control": "no-cache"
-             }
+    resp_2 = requests.post(
+        "https://api.luftdaten.info/v1/push-sensor-data/",
+        json={
+            "software_version": "enviro-plus 0.0.1",
+            "sensordatavalues": temp_values_json
+        },
+        headers={
+            "X-PIN": "11",
+            "X-Sensor": id,
+            "Content-Type": "application/json",
+            "cache-control": "no-cache"
+        }

     )
 
     if resp_1.ok and resp_2.ok:
     )
 
     if resp_1.ok and resp_2.ok:

diff --git a/examples/noise-amps-at-freqs.py b/examples/noise-amps-at-freqs.py
index 8b1ddd57acf13226899dba878e717f48adc615a7..4c14c585b894fca998dc30069c1887693d884236 100755 (executable)
--- a/examples/noise-amps-at-freqs.py
+++ b/examples/noise-amps-at-freqs.py
@@ -15,11 +15,11 @@ Press Ctrl+C to exit!
 noise = Noise()
 
 disp = ST7735.ST7735(
 noise = Noise()
 
 disp = ST7735.ST7735(

-        port=0,
-        cs=ST7735.BG_SPI_CS_FRONT,
-        dc=9,
-        backlight=12,
-        rotation=90)
+    port=0,
+    cs=ST7735.BG_SPI_CS_FRONT,
+    dc=9,
+    backlight=12,
+    rotation=90)

 
 disp.begin()
 
 
 disp.begin()
 

diff --git a/examples/noise-profile.py b/examples/noise-profile.py
index 1afdff5b6ea0ad57be178ae104521196ae2a20de..40844391b84544cadbf154985782f5d52f3d63c6 100755 (executable)
--- a/examples/noise-profile.py
+++ b/examples/noise-profile.py
@@ -13,11 +13,11 @@ Press Ctrl+C to exit!
 noise = Noise()
 
 disp = ST7735.ST7735(
 noise = Noise()
 
 disp = ST7735.ST7735(

-        port=0,
-        cs=ST7735.BG_SPI_CS_FRONT,
-        dc=9,
-        backlight=12,
-        rotation=90)
+    port=0,
+    cs=ST7735.BG_SPI_CS_FRONT,
+    dc=9,
+    backlight=12,
+    rotation=90)

 
 disp.begin()
 
 
 disp.begin()
 

diff --git a/examples/weather-and-light.py b/examples/weather-and-light.py
index a26ec7b004651d161f80c4f4afd25dca8773ef4d..bccf7cc0d69cf09947389ff01607706346e45046 100755 (executable)
--- a/examples/weather-and-light.py
+++ b/examples/weather-and-light.py
@@ -109,19 +109,19 @@ def sun_moon_time(city_name, time_zone):
     if sunrise_today < local_dt < sunset_today:
         day = True
         period = sunset_today - sunrise_today
     if sunrise_today < local_dt < sunset_today:
         day = True
         period = sunset_today - sunrise_today

-        mid = sunrise_today + (period / 2)
+        # mid = sunrise_today + (period / 2)

         progress = local_dt - sunrise_today
 
     elif local_dt > sunset_today:
         day = False
         period = sunrise_tomorrow - sunset_today
         progress = local_dt - sunrise_today
 
     elif local_dt > sunset_today:
         day = False
         period = sunrise_tomorrow - sunset_today

-        mid = sunset_today + (period / 2)
+        # mid = sunset_today + (period / 2)

         progress = local_dt - sunset_today
 
     else:
         day = False
         period = sunrise_today - sunset_yesterday
         progress = local_dt - sunset_today
 
     else:
         day = False
         period = sunrise_today - sunset_yesterday

-        mid = sunset_yesterday + (period / 2)
+        # mid = sunset_yesterday + (period / 2)

         progress = local_dt - sunset_yesterday
 
     # Convert time deltas to seconds
         progress = local_dt - sunset_yesterday
 
     # Convert time deltas to seconds


@@ -151,7 +151,7 @@ def draw_background(progress, period, day):
 
     # New image for background colour
     img = Image.new('RGBA', (WIDTH, HEIGHT), color=background)
 
     # New image for background colour
     img = Image.new('RGBA', (WIDTH, HEIGHT), color=background)

-    draw = ImageDraw.Draw(img)
+    # draw = ImageDraw.Draw(img)

 
     # New image for sun/moon overlay
     overlay = Image.new('RGBA', (WIDTH, HEIGHT), color=(0, 0, 0, 0))
 
     # New image for sun/moon overlay
     overlay = Image.new('RGBA', (WIDTH, HEIGHT), color=(0, 0, 0, 0))


@@ -216,12 +216,12 @@ def analyse_pressure(pressure, t):
         slope = line[0][0]
         intercept = line[0][1]
         variance = numpy.var(pressure_vals)
         slope = line[0][0]
         intercept = line[0][1]
         variance = numpy.var(pressure_vals)

-        residuals = numpy.var([(slope * x + intercept - y)  for x, y in zip(time_vals, pressure_vals)])
+        residuals = numpy.var([(slope * x + intercept - y) for x, y in zip(time_vals, pressure_vals)])

         r_squared = 1 - residuals / variance
 
         # Calculate change in pressure per hour
         change_per_hour = slope * 60 * 60
         r_squared = 1 - residuals / variance
 
         # Calculate change in pressure per hour
         change_per_hour = slope * 60 * 60

-        variance_per_hour = variance * 60 * 60
+        # variance_per_hour = variance * 60 * 60

 
         mean_pressure = numpy.mean(pressure_vals)
 
 
         mean_pressure = numpy.mean(pressure_vals)
 


@@ -244,10 +244,10 @@ def analyse_pressure(pressure, t):
         change_per_hour = 0
         trend = "-"
 
         change_per_hour = 0
         trend = "-"
 

-#    time.sleep(interval)
-
+    # time.sleep(interval)

     return (mean_pressure, change_per_hour, trend)
 
     return (mean_pressure, change_per_hour, trend)
 

+

 def describe_pressure(pressure):
     """Convert pressure into barometer-type description."""
     if pressure < 970:
 def describe_pressure(pressure):
     """Convert pressure into barometer-type description."""
     if pressure < 970:


@@ -385,7 +385,7 @@ while True:
     else:
         range_string = "------"
     img = overlay_text(img, (68, 18 + spacing), range_string, font_sm, align_right=True, rectangle=True)
     else:
         range_string = "------"
     img = overlay_text(img, (68, 18 + spacing), range_string, font_sm, align_right=True, rectangle=True)

-    temp_icon = Image.open(path + "/icons/temperature.png")
+    temp_icon = Image.open(f"{path}/icons/temperature.png")

     img.paste(temp_icon, (margin, 18), mask=temp_icon)
 
     # Humidity
     img.paste(temp_icon, (margin, 18), mask=temp_icon)
 
     # Humidity


@@ -396,7 +396,7 @@ while True:
     spacing = font_lg.getsize(humidity_string)[1] + 1
     humidity_desc = describe_humidity(corr_humidity).upper()
     img = overlay_text(img, (68, 48 + spacing), humidity_desc, font_sm, align_right=True, rectangle=True)
     spacing = font_lg.getsize(humidity_string)[1] + 1
     humidity_desc = describe_humidity(corr_humidity).upper()
     img = overlay_text(img, (68, 48 + spacing), humidity_desc, font_sm, align_right=True, rectangle=True)

-    humidity_icon = Image.open(path + "/icons/humidity-" + humidity_desc.lower() + ".png")
+    humidity_icon = Image.open(f"{path}/icons/humidity-{humidity_desc.lower()}.png")

     img.paste(humidity_icon, (margin, 48), mask=humidity_icon)
 
     # Light
     img.paste(humidity_icon, (margin, 48), mask=humidity_icon)
 
     # Light


@@ -406,7 +406,7 @@ while True:
     spacing = font_lg.getsize(light_string.replace(",", ""))[1] + 1
     light_desc = describe_light(light).upper()
     img = overlay_text(img, (WIDTH - margin - 1, 18 + spacing), light_desc, font_sm, align_right=True, rectangle=True)
     spacing = font_lg.getsize(light_string.replace(",", ""))[1] + 1
     light_desc = describe_light(light).upper()
     img = overlay_text(img, (WIDTH - margin - 1, 18 + spacing), light_desc, font_sm, align_right=True, rectangle=True)

-    light_icon = Image.open(path + "/icons/bulb-" + light_desc.lower() +  ".png")
+    light_icon = Image.open(f"{path}/icons/bulb-{light_desc.lower()}.png")

     img.paste(humidity_icon, (80, 18), mask=light_icon)
 
     # Pressure
     img.paste(humidity_icon, (80, 18), mask=light_icon)
 
     # Pressure


@@ -418,7 +418,7 @@ while True:
     pressure_desc = describe_pressure(mean_pressure).upper()
     spacing = font_lg.getsize(pressure_string.replace(",", ""))[1] + 1
     img = overlay_text(img, (WIDTH - margin - 1, 48 + spacing), pressure_desc, font_sm, align_right=True, rectangle=True)
     pressure_desc = describe_pressure(mean_pressure).upper()
     spacing = font_lg.getsize(pressure_string.replace(",", ""))[1] + 1
     img = overlay_text(img, (WIDTH - margin - 1, 48 + spacing), pressure_desc, font_sm, align_right=True, rectangle=True)

-    pressure_icon = Image.open(path + "/icons/weather-" + pressure_desc.lower() +  ".png")
+    pressure_icon = Image.open(f"{path}/icons/weather-{pressure_desc.lower()}.png")

     img.paste(pressure_icon, (80, 48), mask=pressure_icon)
 
     # Display image
     img.paste(pressure_icon, (80, 48), mask=pressure_icon)
 
     # Display image

diff --git a/library/tests/conftest.py b/library/tests/conftest.py
new file mode 100644 (file)
index 0000000..8a3ffb4
--- /dev/null
+++ b/library/tests/conftest.py
@@ -0,0 +1,56 @@
+"""Test configuration.\r
+These allow the mocking of various Python modules\r
+that might otherwise have runtime side-effects.\r
+"""\r
+import sys\r
+import mock\r
+import pytest\r
+from i2cdevice import MockSMBus\r
+\r
+\r
+class SMBusFakeDevice(MockSMBus):\r
+    def __init__(self, i2c_bus):\r
+        MockSMBus.__init__(self, i2c_bus)\r
+        self.regs[0x00:0x01] = 0x0f, 0x00\r
+\r
+\r
+@pytest.fixture(scope='function', autouse=False)\r
+def GPIO():\r
+    """Mock RPi.GPIO module."""\r
+    GPIO = mock.MagicMock()\r
+    # Fudge for Python < 37 (possibly earlier)\r
+    sys.modules['RPi'] = mock.Mock()\r
+    sys.modules['RPi'].GPIO = GPIO\r
+    sys.modules['RPi.GPIO'] = GPIO\r
+    yield GPIO\r
+    del sys.modules['RPi']\r
+    del sys.modules['RPi.GPIO']\r
+\r
+\r
+@pytest.fixture(scope='function', autouse=False)\r
+def spidev():\r
+    """Mock spidev module."""\r
+    spidev = mock.MagicMock()\r
+    sys.modules['spidev'] = spidev\r
+    yield spidev\r
+    del sys.modules['spidev']\r
+\r
+\r
+@pytest.fixture(scope='function', autouse=False)\r
+def smbus():\r
+    """Mock smbus module."""\r
+    smbus = mock.MagicMock()\r
+    smbus.SMBus = SMBusFakeDevice\r
+    sys.modules['smbus'] = smbus\r
+    yield smbus\r
+    del sys.modules['smbus']\r
+\r
+\r
+@pytest.fixture(scope='function', autouse=False)\r
+def atexit():\r
+    """Mock atexit module."""\r
+    atexit = mock.MagicMock()\r
+    sys.modules['atexit'] = atexit\r
+    yield atexit\r
+    del sys.modules['atexit']\r
+\r

diff --git a/library/tests/test_setup.py b/library/tests/test_setup.py
index 7c25d9465bb372038e6b0b5ef0a85f8e606f004b..95080b6bc63293166d7a36c75b4d8a3eb6bca9f2 100644 (file)
--- a/library/tests/test_setup.py
+++ b/library/tests/test_setup.py
@@ -1,32 +1,15 @@
 import sys
 import mock
 import sys
 import mock

-from i2cdevice import MockSMBus

 
 
 
 

-class SMBusFakeDevice(MockSMBus):
-    def __init__(self, i2c_bus):
-        MockSMBus.__init__(self, i2c_bus)
-        self.regs[0x00:0x01] = 0x0f, 0x00
-
-
-def test_gas_setup():
-    sys.modules['RPi'] = mock.Mock()
-    sys.modules['RPi.GPIO'] = mock.Mock()
-    smbus = mock.Mock()
-    smbus.SMBus = SMBusFakeDevice
-    sys.modules['smbus'] = smbus
+def test_gas_setup(GPIO, smbus):

     from enviroplus import gas
     gas._is_setup = False
     gas.setup()
     gas.setup()
 
 
     from enviroplus import gas
     gas._is_setup = False
     gas.setup()
     gas.setup()
 
 

-def test_gas_read_all():
-    sys.modules['RPi'] = mock.Mock()
-    sys.modules['RPi.GPIO'] = mock.Mock()
-    smbus = mock.Mock()
-    smbus.SMBus = SMBusFakeDevice
-    sys.modules['smbus'] = smbus
+def test_gas_read_all(GPIO, smbus):

     from enviroplus import gas
     gas._is_setup = False
     result = gas.read_all()
     from enviroplus import gas
     gas._is_setup = False
     result = gas.read_all()


@@ -43,12 +26,7 @@ def test_gas_read_all():
     assert "Oxidising" in str(result)
 
 
     assert "Oxidising" in str(result)
 
 

-def test_gas_read_each():
-    sys.modules['RPi'] = mock.Mock()
-    sys.modules['RPi.GPIO'] = mock.Mock()
-    smbus = mock.Mock()
-    smbus.SMBus = SMBusFakeDevice
-    sys.modules['smbus'] = smbus
+def test_gas_read_each(GPIO, smbus):

     from enviroplus import gas
     gas._is_setup = False
 
     from enviroplus import gas
     gas._is_setup = False
 


@@ -57,12 +35,7 @@ def test_gas_read_each():
     assert int(gas.read_nh3()) == 16813
 
 
     assert int(gas.read_nh3()) == 16813
 
 

-def test_gas_read_adc():
-    sys.modules['RPi'] = mock.Mock()
-    sys.modules['RPi.GPIO'] = mock.Mock()
-    smbus = mock.Mock()
-    smbus.SMBus = SMBusFakeDevice
-    sys.modules['smbus'] = smbus
+def test_gas_read_adc(GPIO, smbus):

     from enviroplus import gas
     gas._is_setup = False
 
     from enviroplus import gas
     gas._is_setup = False
 


@@ -71,12 +44,7 @@ def test_gas_read_adc():
     assert gas.read_adc() == 0.255
 
 
     assert gas.read_adc() == 0.255
 
 

-def test_gas_read_adc_default_gain():
-    sys.modules['RPi'] = mock.Mock()
-    sys.modules['RPi.GPIO'] = mock.Mock()
-    smbus = mock.Mock()
-    smbus.SMBus = SMBusFakeDevice
-    sys.modules['smbus'] = smbus
+def test_gas_read_adc_default_gain(GPIO, smbus):

     from enviroplus import gas
     gas._is_setup = False
 
     from enviroplus import gas
     gas._is_setup = False
 


@@ -84,12 +52,7 @@ def test_gas_read_adc_default_gain():
     assert gas.read_adc() == 0.255
 
 
     assert gas.read_adc() == 0.255
 
 

-def test_gas_read_adc_str():
-    sys.modules['RPi'] = mock.Mock()
-    sys.modules['RPi.GPIO'] = mock.Mock()
-    smbus = mock.Mock()
-    smbus.SMBus = SMBusFakeDevice
-    sys.modules['smbus'] = smbus
+def test_gas_read_adc_str(GPIO, smbus):

     from enviroplus import gas
     gas._is_setup = False
 
     from enviroplus import gas
     gas._is_setup = False