From 56e497cf712ca13aeb5ac11c333c3ac0e7a0eb8f Mon Sep 17 00:00:00 2001 From: brentru Date: Fri, 22 Feb 2019 18:04:23 -0500 Subject: [PATCH 1/4] fixs per sommersoft's review --- adafruit_io/adafruit_io.py | 4 ++-- docs/api.rst | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/adafruit_io/adafruit_io.py b/adafruit_io/adafruit_io.py index 524b3dd..cb2429e 100755 --- a/adafruit_io/adafruit_io.py +++ b/adafruit_io/adafruit_io.py @@ -56,7 +56,7 @@ def __init__(self, adafruit_io_username, adafruit_io_key, wifi_manager): """ self.username = adafruit_io_username self.key = adafruit_io_key - if wifi_manager: + if isinstance(wifi, adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager): self.wifi = wifi_manager else: raise TypeError("This library requires a WiFiManager object.") @@ -89,7 +89,7 @@ def _compose_path(self, path): """Composes a valid API request path. :param str path: Adafruit IO API URL path. """ - return "{0}/{1}/{2}/{3}".format('https://io.adafruit.com/api', 'v2', self.username, path) + return "https://io.adafruit.com/api/v2/{0}/{1}".format(self.username, path) # HTTP Requests def _post(self, path, payload): diff --git a/docs/api.rst b/docs/api.rst index 4705ac0..f37bb28 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -5,5 +5,5 @@ API .. If your library file(s) are nested in a directory (e.g. /adafruit_foo/foo.py) .. use this format as the module name: "adafruit_foo.foo" -.. automodule:: adafruit_io +.. automodule:: adafruit_io.adafruit_io :members: From 4e2cc96240320e0555dc0c0d95330a845535f6e9 Mon Sep 17 00:00:00 2001 From: brentru Date: Fri, 22 Feb 2019 18:15:28 -0500 Subject: [PATCH 2/4] check wifi_manager kwarg, then assign instance --- adafruit_io/adafruit_io.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/adafruit_io/adafruit_io.py b/adafruit_io/adafruit_io.py index cb2429e..e94c04a 100755 --- a/adafruit_io/adafruit_io.py +++ b/adafruit_io/adafruit_io.py @@ -39,6 +39,7 @@ https://github.com/adafruit/Adafruit_CircuitPython_ESP32SPI """ from adafruit_io.adafruit_io_errors import AdafruitIO_RequestError, AdafruitIO_ThrottleError +from adafruit_esp32spi import adafruit_esp32spi_wifimanager __version__ = "0.0.0-auto.0" __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_Adafruit_IO.git" @@ -56,7 +57,7 @@ def __init__(self, adafruit_io_username, adafruit_io_key, wifi_manager): """ self.username = adafruit_io_username self.key = adafruit_io_key - if isinstance(wifi, adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager): + if isinstance(wifi_manager, adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager): self.wifi = wifi_manager else: raise TypeError("This library requires a WiFiManager object.") From cae55d236ec79178928080810b074d9d06b86437 Mon Sep 17 00:00:00 2001 From: brentru Date: Fri, 22 Feb 2019 18:18:19 -0500 Subject: [PATCH 3/4] fix import order for travis --- adafruit_io/adafruit_io.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adafruit_io/adafruit_io.py b/adafruit_io/adafruit_io.py index e94c04a..a7606ab 100755 --- a/adafruit_io/adafruit_io.py +++ b/adafruit_io/adafruit_io.py @@ -38,8 +38,8 @@ * Adafruit's ESP32SPI library: https://github.com/adafruit/Adafruit_CircuitPython_ESP32SPI """ -from adafruit_io.adafruit_io_errors import AdafruitIO_RequestError, AdafruitIO_ThrottleError from adafruit_esp32spi import adafruit_esp32spi_wifimanager +from adafruit_io.adafruit_io_errors import AdafruitIO_RequestError, AdafruitIO_ThrottleError __version__ = "0.0.0-auto.0" __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_Adafruit_IO.git" From 04b6fde5da5e68cff8e48c87fb9ebfc341871f2d Mon Sep 17 00:00:00 2001 From: brentru Date: Mon, 25 Feb 2019 09:56:05 -0500 Subject: [PATCH 4/4] add neopixel to autodoc_mock_imports --- docs/conf.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/conf.py b/docs/conf.py index e3d0d23..b875a8a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -16,6 +16,8 @@ 'sphinx.ext.todo', ] +autodoc_mock_imports = ["digitalio", "busdevice", "neopixel", "adafruit_esp32spi"] + intersphinx_mapping = {'python': ('https://docs.python.org/3.4', None),'CircuitPython': ('https://circuitpython.readthedocs.io/en/latest/', None)} # Add any paths that contain templates here, relative to this directory.