Merge pull request #556 from dhalbert/remove-circuitpython_typing

remove _typing and circuitpython_typing

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 79c25752f014da9e0fd5072dcf1a7c712b2fe2d6..0da2cc6c88f3118d577f90f6bfc9c7fc90122f82 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -40,7 +40,7 @@ jobs:
       run: git describe --dirty --always --tags
     - name: Check formatting
       run: |
-        black --check --target-version=py35 .
+        black --check --target-version=py37 .
     - name: PyLint
       run: |
         pylint $( find src -name '*.py' )

diff --git a/README.rst b/README.rst
index 5e9c020b8301a04ebb53dbcbc2e2dedba4ac8c6b..8f3aa290927d82c1ad7bb809e84730f2e92c40c8 100755 (executable)
--- 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 e25be92dacdfcced7f7020bd890a6d4872ff7052..b28e684769b481a3ded654ab2443ba45b59b7c13 100755 (executable)
--- 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 db820f227fac90f982d4430440e663f51a770933..a819f3203376f501fbc30be13c7a9d3b0193dc56 100755 (executable)
--- 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 (file)
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 (file)
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 38ed5970d6b7c844674b6f854b2b2d3c9b995603..74a5d8a66b75f42a270256345a2b986874276732 100755 (executable)
--- 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 {} {}"