From: Dan Halbert Date: Tue, 15 Feb 2022 21:29:51 +0000 (-0500) Subject: remove _typing and circuitpython_typing X-Git-Tag: 7.0.0^2~1 X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/6ecc50af7816e1db796d13160cbd398b67f66cd9 remove _typing and circuitpython_typing --- diff --git a/README.rst b/README.rst index 5e9c020..8f3aa29 100755 --- a/README.rst +++ b/README.rst @@ -20,12 +20,10 @@ Introduction This repository contains a selection of packages emulating the CircuitPython API for devices or hosts running CPython or MicroPython. Working code exists to emulate these CircuitPython packages: -* **_typing** - (Legacy) subset of types for C-level protocols * **analogio** - analog input/output pins, using pin identities from board+microcontroller packages * **bitbangio** - software-driven interfaces for I2C, SPI * **board** - breakout-specific pin identities * **busio** - hardware-driven interfaces for I2C, SPI, UART -* **circuitpython_typing** - Subset of types for C-level protocols * **digitalio** - digital input/output pins, using pin identities from board+microcontroller packages * **keypad** - support for scanning keys and key matrices * **microcontroller** - chip-specific pin identities diff --git a/docs/api.rst b/docs/api.rst index e25be92..b28e684 100755 --- a/docs/api.rst +++ b/docs/api.rst @@ -4,9 +4,6 @@ .. 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:: _typing - :members: - .. automodule:: adafruit_blinka :members: @@ -28,9 +25,6 @@ .. automodule:: busio :members: -.. automodule:: circuitpython_typing - :members: - .. automodule:: digitalio :members: diff --git a/setup.py b/setup.py index db820f2..a819f32 100755 --- a/setup.py +++ b/setup.py @@ -52,12 +52,10 @@ setup( # py_modules lists top-level single file packages to include. # find_packages only finds packages in directories with __init__.py files. py_modules=[ - "_typing", "analogio", "bitbangio", "board", "busio", - "circuitpython_typing", "digitalio", "keypad", "micropython", diff --git a/src/_typing.py b/src/_typing.py deleted file mode 100644 index 0e371c4..0000000 --- a/src/_typing.py +++ /dev/null @@ -1,31 +0,0 @@ -# The MIT License (MIT) -# -# Copyright (c) 2017 cefn for adafruit industries -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -""" -`_typing` - Define (legacy) subset of types for C-level protocols -================================================================= - -* Author(s): Alec Delaney - -See `CircuitPython:circuitpython_typing` in CircuitPython for more details. -""" - -from circuitpython_typing import * # pylint: disable=wildcard-import,unused-wildcard-import diff --git a/src/circuitpython_typing.py b/src/circuitpython_typing.py deleted file mode 100644 index caad6f2..0000000 --- a/src/circuitpython_typing.py +++ /dev/null @@ -1,49 +0,0 @@ -# The MIT License (MIT) -# -# Copyright (c) 2017 cefn for adafruit industries -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -""" -`circuitpython_typing` - Define subset of types for C-level protocols -===================================================================== - -See `CircuitPython:circuitpython_typing` in CircuitPython for more details. - -* Author(s): Alec Delaney -""" - -from typing import Union -from array import array - -ReadableBuffer = Union[bytes, bytearray, memoryview, array] -"""Classes that implement the readable buffer protocol - - * `bytes` - * `bytearray` - * `memoryview` - * `array.array` -""" - -WriteableBuffer = Union[bytearray, memoryview, array] -"""Classes that implement the writeable buffer protocol - - * `bytearray` - * `memoryview` - * `array.array` -""" diff --git a/test/scripts/upload_feather_huzzah_micropython_put.sh b/test/scripts/upload_feather_huzzah_micropython_put.sh index 38ed597..74a5d8a 100755 --- a/test/scripts/upload_feather_huzzah_micropython_put.sh +++ b/test/scripts/upload_feather_huzzah_micropython_put.sh @@ -48,4 +48,4 @@ find . -type f -name '*.py' | \ xargs -n1 -I {} sh -c "echo compiling {} ...; ${MPYCROSS} {}" # upload adafruit blinka .mpy files find . -type f -name '*.mpy' | \ - xargs -n1 -I {} sh -c "echo uploading {} ...; ampy --port ${PORT} put {} {}" \ No newline at end of file + xargs -n1 -I {} sh -c "echo uploading {} ...; ampy --port ${PORT} put {} {}" diff --git a/test/src/testing/universal/i2c.py b/test/src/testing/universal/i2c.py index ba74044..184fee4 100644 --- a/test/src/testing/universal/i2c.py +++ b/test/src/testing/universal/i2c.py @@ -66,7 +66,7 @@ class TestMMA8451Interactive(TestCase): sensor = adafruit_mma8451.MMA8451(i2c) x, y, z = sensor.acceleration - absolute = math.sqrt(x**2 + y**2 + z**2) + absolute = math.sqrt(x ** 2 + y ** 2 + z ** 2) self.assertTrue(9 <= absolute <= 11, "Not earth gravity") orientation = sensor.orientation