Ship micropython as a typed package, drop micropython-stubs

circuitpython-stubs also installs micropython-stubs/__init__.pyi, so the
two wheels fought over the same file (adafruit/circuitpython#11221).
Move micropython.py into a package with inline annotations and py.typed;
the stubs still take precedence when both are installed.

Author: 4RH1T3CT0R7

setup.py

@@ -79,7 +79,7 @@
     python_requires=">=3.9.0",
     url="https://github.com/adafruit/Adafruit_Blinka",
     package_dir={"": "src"},
-    packages=find_packages("src") + ["micropython-stubs"],
+    packages=find_packages("src"),
     # py_modules lists top-level single file packages to include.
     # find_packages only finds packages in directories with __init__.py files.
     py_modules=[
@@ -89,7 +89,6 @@
         "busio",
         "digitalio",
         "keypad",
-        "micropython",
         "neopixel_write",
         "onewireio",
         "pulseio",
@@ -109,7 +108,7 @@
         "adafruit_blinka.microcontroller.amlogic.meson_g12_common.pulseio": [
             "libgpiod_pulsein",
         ],
-        "micropython-stubs": ["*.pyi"],
+        "micropython": ["py.typed"],
     },
     include_package_data=True,
     install_requires=[

src/micropython.py

@@ -8,19 +8,27 @@
 * Author(s): cefn
 """
 
-from typing import Callable, TypeVar, Any, NoReturn
+from typing import Any, Callable, NoReturn, TypeVar
 
 Fun = TypeVar("Fun", bound=Callable[..., Any])
 T = TypeVar("T")
 
+
 def const(x: T) -> T:
     "Emulate making a constant"
+    return x
+
 
 def native(f: Fun) -> Fun:
     "Emulate making a native"
+    return f
+
 
 def viper(f: Fun) -> NoReturn:
     "User is attempting to use a viper code emitter"
+    raise SyntaxError("invalid micropython decorator")
+
 
 def asm_thumb(f: Fun) -> NoReturn:
     "User is attempting to use an inline assembler"
+    raise SyntaxError("invalid micropython decorator")

src/micropython-stubs/__init__.pyi src/micropython/__init__.pysrc/micropython-stubs/__init__.pyi renamed to src/micropython/__init__.py

@@ -0,0 +1,3 @@
+# SPDX-FileCopyrightText: 2021 Melissa LeBlanc-Williams for Adafruit Industries
+#
+# SPDX-License-Identifier: MIT