update requirements and dependencies (#69)

* update requirements

* baseline CI off Python 3.10

* update callbacks

Author: tomkralidis

.github/workflows/debian.yml

@@ -13,7 +13,7 @@ jobs:
       - uses: actions/setup-python@v3
         name: setup Python
         with:
-          python-version: 3.8
+          python-version: '3.10'
       - name: Checkout pywis-pubsub
         uses: actions/checkout@master
       - name: build Debian package 🏗️

.github/workflows/flake8.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/setup-python@v3
         name: setup Python
         with:
-          python-version: 3.8
+          python-version: '3.10'
       - name: Checkout pywis-pubsub
         uses: actions/checkout@master
       - name: Install flake8

.github/workflows/test-publish-subscribe-download.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/setup-python@v3
         name: setup Python
         with:
-          python-version: 3.8
+          python-version: '3.10'
       - name: Install pywis-pubsub
         run: |
           python3 setup.py install

pywis_pubsub/mqtt.py

@@ -63,7 +63,8 @@ def __init__(self, broker: str, options: dict = {}) -> None:
 
         msg = f'Connecting to broker {self.broker_safe_url} with id {self.client_id}'  # noqa
         LOGGER.debug(msg)
-        self.conn = mqtt_client.Client(self.client_id,
+        self.conn = mqtt_client.Client(mqtt_client.CallbackAPIVersion.VERSION2,
+                                       self.client_id,
                                        userdata=self.userdata,
                                        transport=transport)
 
@@ -141,15 +142,16 @@ def sub(self, topics: list, qos: int = 1) -> None:
         :returns: `None`
         """
 
-        def on_connect(client, userdata, flags, rc):
+        def on_connect(client, userdata, flags, reason_code, properties):
             LOGGER.debug(f'Connected to broker {self.broker_safe_url}')
             LOGGER.debug(f'Subscribing to topics {topics}')
             for topic in topics:
                 client.subscribe(topic, qos=qos)
                 LOGGER.debug(f'Subscribed to topic {topic}, qos {qos}')
 
-        def on_disconnect(client, userdata, rc):
-            LOGGER.debug(f'Disconnected from {self.broker_safe_url}: ({rc})')
+        def on_disconnect(client, userdata, flags, reason_code, properties):
+            msg = f'Disconnected from {self.broker_safe_url}: ({reason_code})'
+            LOGGER.debug(msg)
 
         LOGGER.debug(f'Subscribing to broker {self.broker_safe_url}, topic(s) {topics}')  # noqa
         self.conn.on_connect = on_connect

requirements.txt

@@ -1,8 +1,7 @@
 boto3
 click
 jsonschema
-paho-mqtt<2
+paho-mqtt
 pyyaml
 requests
-shapely<2
-urllib3<2
+shapely