Update tox and get tests running on Python 3.6 - 3.8

Author: flyte

.travis.yml

@@ -11,29 +11,20 @@ install:
 
 jobs:
   include:
-    - python: 2.7
-      stage: test
-      script: tox -e py27
-
     - python: 3.6
       stage: test
       script: tox -e py36
 
-    - stage: publish
-      script: skip
-      python: 2.7
-      deploy:
-        provider: pypi
-        user: flyte
-        password:
-          secure: "eSedXSEOXM+YGl+zQUjDg2EGhTIHfiMBn2Bcrx5Gyinx19Z9vaL/oy6wUw+0bpA3hztQZzgFwxxgAlEvvp9xoWknR+9AWUYlmmruWrZMcnxWG6d+kTmLehQ+xetObgqszZorVC/WmvvL7t6Tuyh/DHZZ3nw5T817jOg243eXVaQr53UFL20879I7elnRc1gGZOz9GuFMJRhGqX3D3tgseR3sKI7IYSOLNVYfJGN9FVdbn8qMcdb6Q8Ecb1RtmmK5p3uBTFe0rSZrhBD3gWjxFrpojSSsrve/duxHkY0c5ZQkv3uihFLzyLh7a8r8HW8sC7uej+HOr989Y9I6So86BHcqynKIZjrXknEsffAeCf/81hrr6Q4hiwNi+d3adnDWz2SwfYF9LvPRYJLguyKSHdjkKp8OJcJedi9rdF6CxX1Tz5RqndZLUkJH4Eybsjf65xJ4KnSbFKizESGzA9ecwCddp39lUt87bto9pZ9uXpxkKm5PLYJVxint1F1Y3C4yq5zDcRsv2J7GKFVsvfkd++N3NMaTm80bxo2sJnw0xoLr3nokzHICkgr5aUuxipYiDt0tiI3xV7k0jRqQM2dsY5Dqq31Sz7CRHVg9JaBcRe58FMrKsKnBisPbzCpAX8xbR/eXo+Y+CIi3ABf9txMz+qft8/LXEJGel2J0srOZCcQ="
-        on:
-          tags: true
-          repo: flyte/pi-mqtt-gpio
-        distributions: bdist_wheel
+    - python: 3.7
+      stage: test
+      script: tox -e py37
+
+    - python: 3.8
+      stage: test
+      script: tox -e py38
 
     - stage: publish
-      python: 3.6
+      python: 3.8
       script: skip
       deploy:
         provider: pypi

MANIFEST.in

@@ -1,3 +1,3 @@
 # http://packages.python.org/distribute/setuptools.html#including-data-files
 include *requirements.txt
-include mqtt_io/config.schema.yml
+include mqtt_io/config/config.schema.yml

Makefile

@@ -6,17 +6,12 @@ packages: clean schema sdist wheel2 wheel3
 sdist: schema
 	python setup.py sdist
 
-wheel2: schema
-	python2 setup.py bdist_wheel
-
 wheel3: schema
 	python3 setup.py bdist_wheel
 
 clean:
-	cp pi_mqtt_gpio/__init__.py.die pi_mqtt_gpio/__init__.py
-	rm -rf .cache .eggs build *.egg-info
 	find pi_mqtt_gpio -type d -name __pycache__ -prune -exec rm -rf {} \;
-	rm -rf dist
+	rm -rf dist .eggs .mypy_cache .pytest_cache *.egg-info
 
 upload: packages
 	twine upload dist/*

Pipfile

@@ -16,7 +16,7 @@ hbmqtt = "*"
 typing-extensions = "*"
 
 [requires]
-python_version = "3.6"
+python_version = ">=3.6"
 
 [pipenv]
-allow_prereleases = true
+allow_prereleases = false

Pipfile.lock

@@ -2,8 +2,6 @@
 Handles config validation and normalisation.
 """
 
-from __future__ import annotations
-
 import logging
 from collections import Counter
 from os.path import dirname, join, realpath
@@ -72,8 +70,9 @@ def get_main_schema() -> ConfigType:
     :rtype: dict
     """
     schema_path = join(dirname(realpath(__file__)), "config.schema.yml")
-    # We write this schema file, so we know it'll adhere to ConfigType rules
-    return cast(ConfigType, yaml.safe_load(open(schema_path)))
+    with open(schema_path) as schema_file:
+        # We write this schema file, so we know it'll adhere to ConfigType rules
+        return cast(ConfigType, yaml.safe_load(schema_file))
 
 
 def get_main_schema_section(section: str) -> ConfigType:
@@ -184,7 +183,7 @@ def validate_and_normalise_main_config(raw_config: Any) -> ConfigType:
 
 
 def validate_and_normalise_sensor_input_config(
-    config: ConfigType, module: GenericSensor
+    config: ConfigType, module: "GenericSensor"
 ) -> ConfigType:
     """
     Validate sensor input configs.
@@ -196,7 +195,7 @@ def validate_and_normalise_sensor_input_config(
 
 
 def validate_and_normalise_digital_input_config(
-    config: ConfigType, module: GenericGPIO
+    config: ConfigType, module: "GenericGPIO"
 ) -> ConfigType:
     """
     Validate digital input configs.
@@ -211,7 +210,7 @@ def validate_and_normalise_digital_input_config(
 
 
 def validate_and_normalise_digital_output_config(
-    config: ConfigType, module: GenericGPIO
+    config: ConfigType, module: "GenericGPIO"
 ) -> ConfigType:
     """
     Validate digital output configs.

mqtt_io/config/__init__.py

@@ -4,8 +4,6 @@
 https://www.home-assistant.io/docs/mqtt/discovery/
 """
 
-from __future__ import annotations
-
 import json
 import logging
 from typing import TYPE_CHECKING
@@ -20,7 +18,7 @@
 
 
 async def hass_announce_digital_input(
-    in_conf: ConfigType, mqtt_config: ConfigType, mqtt_client: MQTTClient
+    in_conf: ConfigType, mqtt_config: ConfigType, mqtt_client: "MQTTClient"
 ) -> None:
     """
     Announces digital input as binary_sensor to HomeAssistant.
@@ -66,7 +64,7 @@ async def hass_announce_digital_input(
 
 
 async def hass_announce_digital_output(
-    out_conf: ConfigType, mqtt_config: ConfigType, mqtt_client: MQTTClient
+    out_conf: ConfigType, mqtt_config: ConfigType, mqtt_client: "MQTTClient"
 ) -> None:
     """
     Announces digital output as switch to HomeAssistant.
@@ -115,7 +113,7 @@ async def hass_announce_digital_output(
 
 
 async def hass_announce_sensor_input(
-    sens_conf: ConfigType, mqtt_config: ConfigType, mqtt_client: MQTTClient
+    sens_conf: ConfigType, mqtt_config: ConfigType, mqtt_client: "MQTTClient"
 ) -> None:
     """
     Announces digital output as sensor to HomeAssistant.

mqtt_io/home_assistant.py

@@ -8,8 +8,6 @@
 # pylint: enable=duplicate-code
 # pylint: disable=too-many-lines
 
-from __future__ import annotations
-
 import asyncio
 import logging
 import re