From 57319f076977680710e789953a770615ab0a4071 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Tue, 7 Dec 2021 17:58:04 -0600 Subject: [PATCH 1/7] print error if user has audioio but is missing waveform library --- adafruit_rtttl.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/adafruit_rtttl.py b/adafruit_rtttl.py index c2087be..9371408 100644 --- a/adafruit_rtttl.py +++ b/adafruit_rtttl.py @@ -19,17 +19,21 @@ import pwmio AUDIOIO_AVAILABLE = False +HAVE_WAVEFORM_LIBRARY = False try: import audioio from adafruit_waveform import sine + HAVE_WAVEFORM_LIBRARY = True AUDIOIO_AVAILABLE = True try: import audiocore except ImportError: audiocore = audioio -except ImportError: - pass +except ImportError as e: + if not HAVE_WAVEFORM_LIBRARY: + print("Have audioio module but missing adafruit_waveform library") + try: from typing import Optional, Union, Tuple, List From c430c26e770e44947b5da70f82022225218a663e Mon Sep 17 00:00:00 2001 From: foamyguy Date: Tue, 7 Dec 2021 17:59:31 -0600 Subject: [PATCH 2/7] code format --- adafruit_rtttl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adafruit_rtttl.py b/adafruit_rtttl.py index 9371408..fdd2015 100644 --- a/adafruit_rtttl.py +++ b/adafruit_rtttl.py @@ -23,6 +23,7 @@ try: import audioio from adafruit_waveform import sine + HAVE_WAVEFORM_LIBRARY = True AUDIOIO_AVAILABLE = True @@ -34,7 +35,6 @@ if not HAVE_WAVEFORM_LIBRARY: print("Have audioio module but missing adafruit_waveform library") - try: from typing import Optional, Union, Tuple, List from audioio import AudioOut From f9a42660ca5e94e55539252ccb4548c7403e0a7a Mon Sep 17 00:00:00 2001 From: foamyguy Date: Thu, 9 Dec 2021 13:46:59 -0600 Subject: [PATCH 3/7] raise ImportError if missing waveform library --- adafruit_rtttl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adafruit_rtttl.py b/adafruit_rtttl.py index fdd2015..f0fcdaf 100644 --- a/adafruit_rtttl.py +++ b/adafruit_rtttl.py @@ -33,7 +33,7 @@ audiocore = audioio except ImportError as e: if not HAVE_WAVEFORM_LIBRARY: - print("Have audioio module but missing adafruit_waveform library") + raise(e) try: from typing import Optional, Union, Tuple, List From 82a2d38b63cfff00f95092041a36068bae2187df Mon Sep 17 00:00:00 2001 From: foamyguy Date: Thu, 9 Dec 2021 13:51:23 -0600 Subject: [PATCH 4/7] code format --- adafruit_rtttl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adafruit_rtttl.py b/adafruit_rtttl.py index f0fcdaf..46d7bf9 100644 --- a/adafruit_rtttl.py +++ b/adafruit_rtttl.py @@ -33,7 +33,7 @@ audiocore = audioio except ImportError as e: if not HAVE_WAVEFORM_LIBRARY: - raise(e) + raise e try: from typing import Optional, Union, Tuple, List From 942a31ac4d5447d9b40c4512834957d046206436 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Thu, 9 Dec 2021 14:00:23 -0600 Subject: [PATCH 5/7] adafruit_waveform in mocks --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index 7b280e5..954bde4 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -20,7 +20,7 @@ "sphinx.ext.viewcode", ] -autodoc_mock_imports = ["pulseio", "pwmio", "audioio"] +autodoc_mock_imports = ["pulseio", "pwmio", "audioio", "adafruit_waveform"] intersphinx_mapping = { "python": ("https://docs.python.org/3.4", None), From 44176e000cf83cead59e5ba8d7522da96a4c3b36 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Thu, 9 Dec 2021 14:12:34 -0600 Subject: [PATCH 6/7] set audioio available var earlier. use consistent name for waveform available variable --- adafruit_rtttl.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/adafruit_rtttl.py b/adafruit_rtttl.py index 46d7bf9..3323e9d 100644 --- a/adafruit_rtttl.py +++ b/adafruit_rtttl.py @@ -19,20 +19,18 @@ import pwmio AUDIOIO_AVAILABLE = False -HAVE_WAVEFORM_LIBRARY = False +WAVEFORM_AVAILABLE = False try: import audioio - from adafruit_waveform import sine - - HAVE_WAVEFORM_LIBRARY = True - AUDIOIO_AVAILABLE = True + from adafruit_waveform import sine + WAVEFORM_AVAILABLE = True try: import audiocore except ImportError: audiocore = audioio except ImportError as e: - if not HAVE_WAVEFORM_LIBRARY: + if not WAVEFORM_AVAILABLE: raise e try: From 1150b18d41277dee3912ea097b4e437d20d93779 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Thu, 9 Dec 2021 14:13:08 -0600 Subject: [PATCH 7/7] code format --- adafruit_rtttl.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/adafruit_rtttl.py b/adafruit_rtttl.py index 3323e9d..848be44 100644 --- a/adafruit_rtttl.py +++ b/adafruit_rtttl.py @@ -22,8 +22,10 @@ WAVEFORM_AVAILABLE = False try: import audioio + AUDIOIO_AVAILABLE = True from adafruit_waveform import sine + WAVEFORM_AVAILABLE = True try: import audiocore