From 1b8a905915cf3b95eb8abdd99bd858570eb16538 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Fri, 19 Jun 2020 19:59:21 -0400 Subject: [PATCH 1/5] incorrect module names in several places, including for PyPi --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 35d1013..e70706d 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ long_description = f.read() setup( - name="adafruit-circuitpython-ble-pulse-oximeter", + name="adafruit-circuitpython-ble-berrymed-pulse-oximeter", use_scm_version=True, setup_requires=["setuptools_scm"], description="BLE Support for BerryMed Pulse Oximeter Service", @@ -44,10 +44,10 @@ "Programming Language :: Python :: 3.5", ], # What does your project relate to? - keywords="adafruit blinka circuitpython micropython ble_contec_pulse_oximeter ble pulse oximeter berrymed spo2", + keywords="adafruit blinka circuitpython micropython ble_berrymed_pulse_oximeter ble pulse oximeter berrymed spo2", # You can just specify the packages manually here if your project is # simple. Or you can use find_packages(). # TODO: IF LIBRARY FILES ARE A PACKAGE FOLDER, # CHANGE `py_modules=['...']` TO `packages=['...']` - py_modules=["adafruit_ble_contec_pulse_oximeter"], + py_modules=["adafruit_ble_berrymed_pulse_oximeter"], ) From f5cc0bb49a4f0d50f6c5879affd6efe77923d23c Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Fri, 19 Jun 2020 20:16:54 -0400 Subject: [PATCH 2/5] Use Python 3.7 for build --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b6977a9..fdde2ed 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,10 +18,10 @@ jobs: awk -F '\/' '{ print tolower($2) }' | tr '_' '-' ) - - name: Set up Python 3.6 + - name: Set up Python 3.7 uses: actions/setup-python@v1 with: - python-version: 3.6 + python-version: 3.7 - name: Versions run: | python3 --version From c208813a376d4c615485c5c3eb210dd0a9ef6ca0 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Sat, 20 Jun 2020 15:06:58 -0400 Subject: [PATCH 3/5] _bleio in autodoc_mock_imports --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index 7d48f4d..4d8f579 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -21,7 +21,7 @@ # Uncomment the below if you use native CircuitPython modules such as # digitalio, micropython and busio. List the modules you use. Without it, the # autodoc module docs will fail to generate with a warning. -# autodoc_mock_imports = ["digitalio", "busio"] +autodoc_mock_imports = ["_bleio"] intersphinx_mapping = { From 70a998302f9e0c793629b15ee4f38e010cf1e5a4 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Sat, 20 Jun 2020 16:36:41 -0400 Subject: [PATCH 4/5] fix setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index e70706d..ea7d2a5 100644 --- a/setup.py +++ b/setup.py @@ -49,5 +49,5 @@ # simple. Or you can use find_packages(). # TODO: IF LIBRARY FILES ARE A PACKAGE FOLDER, # CHANGE `py_modules=['...']` TO `packages=['...']` - py_modules=["adafruit_ble_berrymed_pulse_oximeter"], + packages=["adafruit_ble_berrymed_pulse_oximeter"], ) From b8ea9a16a1caa78826b70193a2cf32c788668f0f Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Sat, 20 Jun 2020 17:29:50 -0400 Subject: [PATCH 5/5] doc fixups --- .../adafruit_ble_transparent_uart.py | 4 ++-- docs/api.rst | 5 +++++ docs/conf.py | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/adafruit_ble_berrymed_pulse_oximeter/adafruit_ble_transparent_uart.py b/adafruit_ble_berrymed_pulse_oximeter/adafruit_ble_transparent_uart.py index a3890c6..7473552 100644 --- a/adafruit_ble_berrymed_pulse_oximeter/adafruit_ble_transparent_uart.py +++ b/adafruit_ble_berrymed_pulse_oximeter/adafruit_ble_transparent_uart.py @@ -21,8 +21,8 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. """ -`nordic` -==================================================== +`adafruit_ble_berrymed_pulse_oximeter.adafruit_ble_transparent_uart` +============================================================================= This module provides Services used by MicroChip diff --git a/docs/api.rst b/docs/api.rst index e5a5b44..4e801a0 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -1,3 +1,5 @@ +:py:mod:`~adafruit_ble_berrymed_pulse_oximeter` +=============================================== .. If you created a package, create one automodule per module in the package. @@ -6,3 +8,6 @@ .. automodule:: adafruit_ble_berrymed_pulse_oximeter :members: + +.. automodule:: adafruit_ble_berrymed_pulse_oximeter.adafruit_ble_transparent_uart + :members: diff --git a/docs/conf.py b/docs/conf.py index 4d8f579..1af8150 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -21,7 +21,7 @@ # Uncomment the below if you use native CircuitPython modules such as # digitalio, micropython and busio. List the modules you use. Without it, the # autodoc module docs will fail to generate with a warning. -autodoc_mock_imports = ["_bleio"] +autodoc_mock_imports = ["bleak"] intersphinx_mapping = {