Merge branch 'main' into mahe-typehint

Author: FoamyGuy

.pre-commit-config.yaml

@@ -4,21 +4,21 @@
 
 repos:
   - repo: https://github.com/python/black
-    rev: 22.3.0
+    rev: 23.3.0
     hooks:
       - id: black
   - repo: https://github.com/fsfe/reuse-tool
-    rev: v0.14.0
+    rev: v1.1.2
     hooks:
       - id: reuse
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.2.0
+    rev: v4.4.0
     hooks:
       - id: check-yaml
       - id: end-of-file-fixer
       - id: trailing-whitespace
   - repo: https://github.com/pycqa/pylint
-    rev: v2.15.5
+    rev: v2.17.4
     hooks:
       - id: pylint
         name: pylint (library code)

.pylintrc

@@ -396,4 +396,4 @@ min-public-methods=1
 
 # Exceptions that will emit a warning when being caught. Defaults to
 # "Exception"
-overgeneral-exceptions=Exception
+overgeneral-exceptions=builtins.Exception

adafruit_io/adafruit_io.py

@@ -257,13 +257,6 @@ def subscribe(self, feed_key: str=None, group_key: str=None, shared_user: str=No
         .. code-block:: python
 
             client.subscribe('temperature')
-
-        Example of subscribing to two Adafruit IO feeds: 'temperature'
-        and 'humidity'.
-
-        .. code-block:: python
-
-            client.subscribe([('temperature'), ('humidity')])
         """
         if shared_user is not None and feed_key is not None:
             validate_feed_key(feed_key)
@@ -338,13 +331,6 @@ def unsubscribe(self, feed_key: str=None, group_key: str=None, shared_user: str=
 
             client.unsubscribe('temperature')
 
-        Example of unsubscribing from two feeds: 'temperature'
-        and 'humidity'
-
-        .. code-block:: python
-
-            client.unsubscribe([('temperature'), ('humidity')])
-
         Example of unsubscribing from a shared feed.
 
         .. code-block:: python
@@ -542,12 +528,12 @@ def _post(self, path: str, payload: json):
         :param str path: Formatted Adafruit IO URL from _compose_path
         :param json payload: JSON data to send to Adafruit IO
         """
-        response = self._http.post(
+        with self._http.post(
             path, json=payload, headers=self._create_headers(self._aio_headers[0])
-        )
-        self._handle_error(response)
-        json_data = response.json()
-        response.close()
+        ) as response:
+            self._handle_error(response)
+            json_data = response.json()
+
         return json_data
 
     def _get(self, path: str):
@@ -556,12 +542,11 @@ def _get(self, path: str):
 
         :param str path: Formatted Adafruit IO URL from _compose_path
         """
-        response = self._http.get(
+        with self._http.get(
             path, headers=self._create_headers(self._aio_headers[1])
-        )
-        self._handle_error(response)
-        json_data = response.json()
-        response.close()
+        ) as response:
+            self._handle_error(response)
+            json_data = response.json()
         return json_data
 
     def _delete(self, path: str):
@@ -570,12 +555,12 @@ def _delete(self, path: str):
 
         :param str path: Formatted Adafruit IO URL from _compose_path
         """
-        response = self._http.delete(
+        with self._http.delete(
             path, headers=self._create_headers(self._aio_headers[0])
-        )
-        self._handle_error(response)
-        json_data = response.json()
-        response.close()
+        ) as response:
+            self._handle_error(response)
+            json_data = response.json()
+
         return json_data
 
     # Data

docs/conf.py

@@ -17,6 +17,7 @@
 # ones.
 extensions = [
     "sphinx.ext.autodoc",
+    "sphinxcontrib.jquery",
     "sphinx.ext.intersphinx",
     "sphinx.ext.napoleon",
     "sphinx.ext.todo",

docs/requirements.txt

@@ -3,3 +3,4 @@
 # SPDX-License-Identifier: Unlicense
 
 sphinx>=4.0.0
+sphinxcontrib-jquery

examples/adafruit_io_mqtt/adafruit_io_feed_callback.py

@@ -49,6 +49,7 @@
 # status_light = adafruit_rgbled.RGBLED(RED_LED, BLUE_LED, GREEN_LED)
 wifi = adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager(esp, secrets, status_light)
 
+
 # Define callback functions which will be called when certain events happen.
 # pylint: disable=unused-argument
 def connected(client):

examples/adafruit_io_mqtt/adafruit_io_location.py

@@ -52,6 +52,7 @@
 # status_light = adafruit_rgbled.RGBLED(RED_LED, BLUE_LED, GREEN_LED)
 wifi = adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager(esp, secrets, status_light)
 
+
 # Define callback functions which will be called when certain events happen.
 # pylint: disable=unused-argument
 def connected(client):

examples/adafruit_io_mqtt/adafruit_io_pubsub_rp2040.py

@@ -35,6 +35,7 @@
 led_pin = DigitalInOut(board.LED)
 led_pin.switch_to_output()
 
+
 # Define callback functions which will be called when certain events happen.
 # pylint: disable=unused-argument
 def connected(client):

examples/adafruit_io_mqtt/adafruit_io_simpletest_cellular.py

@@ -45,6 +45,7 @@
     gsm.connect()
     time.sleep(5)
 
+
 # Define callback functions which will be called when certain events happen.
 # pylint: disable=unused-argument
 def connected(client):

examples/adafruit_io_mqtt/adafruit_io_simpletest_esp32s2.py

@@ -31,6 +31,7 @@
 wifi.radio.connect(secrets["ssid"], secrets["password"])
 print("Connected to %s!" % secrets["ssid"])
 
+
 # Define callback functions which will be called when certain events happen.
 # pylint: disable=unused-argument
 def connected(client):

examples/adafruit_io_mqtt/adafruit_io_simpletest_eth.py

@@ -30,6 +30,7 @@
 # Initialize ethernet interface with DHCP
 eth = WIZNET5K(spi_bus, cs)
 
+
 # Define callback functions which will be called when certain events happen.
 # pylint: disable=unused-argument
 def connected(client):

examples/adafruit_io_mqtt/adafruit_io_time.py

@@ -52,6 +52,7 @@
 # status_light = adafruit_rgbled.RGBLED(RED_LED, BLUE_LED, GREEN_LED)
 wifi = adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager(esp, secrets, status_light)
 
+
 # Define callback functions which will be called when certain events happen.
 # pylint: disable=unused-argument
 def connected(client):

examples/adafruit_io_simpletest.py

@@ -55,6 +55,7 @@
 # status_light = adafruit_rgbled.RGBLED(RED_LED, BLUE_LED, GREEN_LED)
 wifi = adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager(esp, secrets, status_light)
 
+
 # Define callback functions which will be called when certain events happen.
 # pylint: disable=unused-argument
 def connected(client):