Merge branch 'asi2700-master' into asi-master

Author: dbrignoli

README.md

@@ -1,62 +1,69 @@
-~~~~
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-micropython-lib is a highly experimental community project.
-
-Please help to drive it to just "experimental" state by testing
-provided packages with MicroPython.
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-~~~~
-
 micropython-lib
 ===============
 micropython-lib is a project to develop a non-monolothic standard library
-for MicroPython. Each module or package is available as a separate
-distribution package from PyPI. Each module is either written from scratch or
-ported from CPython. 
+for "advanced" MicroPython fork (https://github.com/pfalcon/micropython).
+Each module or package is available as a separate distribution package from
+PyPI. Each module comes from one of the following sources (and thus each
+module has its own licensing terms):
 
-Note that the main target of micropython-lib is a "Unix" port of MicroPython
-(additional ports to support are to be determined). Actual system requirements
-vary per module. Though if a module is not related to I/O, the module should
-work without problem on bare-metal ports too (e.g. pyboard).
+* written from scratch specifically for MicroPython
+* ported from CPython
+* ported from some other Python implementation, e.g. PyPy
+* some modules actually aren't implemented yet and are dummy
+
+Note that the main target of micropython-lib is a "Unix" port of the
+aforementioned fork of MicroPython. Actual system requirements vary per
+module. Majority of modules are compatible with the upstream MicroPython,
+though some may require additional functionality/optimizations present in
+the "advanced" fork. Modules not related to I/O may also work without
+problems on bare-metal ports, not just on "Unix" port (e.g. pyboard).
 
 
 Usage
 -----
 micropython-lib packages are published on PyPI (Python Package Index),
 the standard Python community package repository: http://pypi.python.org/ .
-On PyPi, you can search for MicroPython related packages and read
-additional package information.
+On PyPI, you can search for MicroPython related packages and read
+additional package information. By convention, all micropython-lib package
+names are prefixed with "micropython-" (the reverse is not true - some
+package starting with "micropython-" aren't part of micropython-lib and
+were released by 3rd parties).
 
-To install packages from PyPI for usage on your local system, use the
-`pip-micropython` tool, which is a simple wrapper around the standard
-`pip` tool, which is used to install packages for CPython.
-The `pip-micropython` tool can be found in `tools` subdirectory 
-of the main MicroPython repository (https://github.com/micropython/micropython).
-Just install the `pip-micropython` script somewhere on your `PATH`.
+Browse available packages
+[via this URL](https://pypi.python.org/pypi?%3Aaction=search&term=micropython).
 
-Afterwards, just use `pip-micropython` in a way similar to `pip`:
+To install packages from PyPI for usage on your local system, use the
+`upip` tool, which is MicroPython's native package manager, similar to
+`pip`, which is used to install packages for CPython. `upip` is bundled
+with MicroPython "Unix" port (i.e. if you build "Unix" port, you
+automatically have `upip` tool). Following examples assume that
+`micropython` binary is available on your `PATH`:
 
 ~~~~
-$ pip-micropython install micropython-copy
+$ micropython -m upip install micropython-pystone
+...
 $ micropython
->>> import copy
->>> copy.copy([1, 2, 3])
-[1, 2, 3]
+>>> import pystone
+>>> pystone.main()
+Pystone(1.2) time for 50000 passes = 0.534
+This machine benchmarks at 93633 pystones/second
 ~~~~
 
-Review the `pip-micropython` source code for more info.
+Run `micropython -m upip --help` for more information about `upip`.
 
 
 Development
 -----------
 To install modules during development, use `make install`. By default, all
-available packages will be installed. To install a specific module, add the 
+available packages will be installed. To install a specific module, add the
 `MOD=<module>` parameter to the end of the `make install` command.
 
 
 Links
 -----
-More information is on GitHub and in the MicroPython forums:
+If you would like to trace evolution of MicroPython packaging support,
+you may find following links useful (note that they may contain outdated
+information):
 
  * https://github.com/micropython/micropython/issues/405
  * http://forum.micropython.org/viewtopic.php?f=5&t=70

__future__/setup.py

@@ -4,17 +4,17 @@
 sys.path.pop(0)
 from setuptools import setup
 sys.path.append("..")
-import optimize_upip
+import sdist_upip
 
 setup(name='micropython-future',
       version='0.0.3',
       description='Dummy __future__ module for MicroPython',
       long_description='This is a dummy implementation of a module for MicroPython standard library.\nIt contains zero or very little functionality, and primarily intended to\navoid import errors (using idea that even if an application imports a\nmodule, it may be not using it onevery code path, so may work at least\npartially). It is expected that more complete implementation of the module\nwill be provided later. Please help with the development if you are\ninterested in this module.',
       url='https://github.com/micropython/micropython-lib',
-      author='MicroPython Developers',
+      author='micropython-lib Developers',
       author_email='[email protected]',
-      maintainer='MicroPython Developers',
+      maintainer='micropython-lib Developers',
       maintainer_email='[email protected]',
       license='MIT',
-      cmdclass={'optimize_upip': optimize_upip.OptimizeUpip},
+      cmdclass={'sdist': sdist_upip.sdist},
       py_modules=['__future__'])

_libc/setup.py

@@ -4,7 +4,7 @@
 sys.path.pop(0)
 from setuptools import setup
 sys.path.append("..")
-import optimize_upip
+import sdist_upip
 
 setup(name='micropython-libc',
       version='0.3.1',
@@ -13,8 +13,8 @@
       url='https://github.com/micropython/micropython-lib',
       author='Paul Sokolovsky',
       author_email='[email protected]',
-      maintainer='MicroPython Developers',
+      maintainer='micropython-lib Developers',
       maintainer_email='[email protected]',
       license='MIT',
-      cmdclass={'optimize_upip': optimize_upip.OptimizeUpip},
+      cmdclass={'sdist': sdist_upip.sdist},
       py_modules=['_libc'])

_markupbase/setup.py

@@ -4,7 +4,7 @@
 sys.path.pop(0)
 from setuptools import setup
 sys.path.append("..")
-import optimize_upip
+import sdist_upip
 
 setup(name='micropython-_markupbase',
       version='3.3.3-1',
@@ -13,9 +13,9 @@
       url='https://github.com/micropython/micropython-lib',
       author='CPython Developers',
       author_email='[email protected]',
-      maintainer='MicroPython Developers',
+      maintainer='micropython-lib Developers',
       maintainer_email='[email protected]',
       license='Python',
-      cmdclass={'optimize_upip': optimize_upip.OptimizeUpip},
+      cmdclass={'sdist': sdist_upip.sdist},
       py_modules=['_markupbase'],
       install_requires=['micropython-re-pcre'])

abc/setup.py

@@ -4,17 +4,17 @@
 sys.path.pop(0)
 from setuptools import setup
 sys.path.append("..")
-import optimize_upip
+import sdist_upip
 
 setup(name='micropython-abc',
       version='0.0.1',
       description='Dummy abc module for MicroPython',
       long_description='This is a dummy implementation of a module for MicroPython standard library.\nIt contains zero or very little functionality, and primarily intended to\navoid import errors (using idea that even if an application imports a\nmodule, it may be not using it onevery code path, so may work at least\npartially). It is expected that more complete implementation of the module\nwill be provided later. Please help with the development if you are\ninterested in this module.',
       url='https://github.com/micropython/micropython-lib',
-      author='MicroPython Developers',
+      author='micropython-lib Developers',
       author_email='[email protected]',
-      maintainer='MicroPython Developers',
+      maintainer='micropython-lib Developers',
       maintainer_email='[email protected]',
       license='MIT',
-      cmdclass={'optimize_upip': optimize_upip.OptimizeUpip},
+      cmdclass={'sdist': sdist_upip.sdist},
       py_modules=['abc'])

argparse/argparse.py

@@ -144,25 +144,37 @@ def render_arg(arg):
             print("  %-16s%s" % (', '.join(opt.names) + render_arg(opt), opt.help))
 
     def parse_args(self, args=None):
+        return self._parse_args_impl(args, False)
+
+    def parse_known_args(self, args=None):
+        return self._parse_args_impl(args, True)
+
+    def _parse_args_impl(self, args, return_unknown):
         if args is None:
             args = sys.argv[1:]
         else:
             args = args[:]
         try:
-            return self._parse_args(args)
+            return self._parse_args(args, return_unknown)
         except _ArgError as e:
             self.usage(False)
             print("error:", e)
             sys.exit(2)
 
-    def _parse_args(self, args):
+    def _parse_args(self, args, return_unknown):
         # add optional args with defaults
         arg_dest = []
         arg_vals = []
         for opt in self.opt:
             arg_dest.append(opt.dest)
             arg_vals.append(opt.default)
 
+        # deal with unknown arguments, if needed
+        unknown = []
+        def consume_unknown():
+            while args and not args[0].startswith("-"):
+                unknown.append(args.pop(0))
+
         # parse all args
         parsed_pos = False
         while args or not parsed_pos:
@@ -179,15 +191,26 @@ def _parse_args(self, args):
                         found = True
                         break
                 if not found:
-                    raise _ArgError("unknown option %s" % a)
+                    if return_unknown:
+                        unknown.append(a)
+                        consume_unknown()
+                    else:
+                        raise _ArgError("unknown option %s" % a)
             else:
                 # positional arg
                 if parsed_pos:
-                    raise _ArgError("extra args: %s" % " ".join(args))
+                    if return_unknown:
+                        unknown = unknown + args
+                        break
+                    else:
+                        raise _ArgError("extra args: %s" % " ".join(args))
                 for pos in self.pos:
                     arg_dest.append(pos.dest)
                     arg_vals.append(pos.parse(pos.names[0], args))
                 parsed_pos = True
+                if return_unknown:
+                    consume_unknown()
 
         # build and return named tuple with arg values
-        return namedtuple("args", arg_dest)(*arg_vals)
+        values = namedtuple("args", arg_dest)(*arg_vals)
+        return (values, unknown) if return_unknown else values

argparse/metadata.txt

@@ -1,4 +1,4 @@
 srctype = micropython-lib
 type = module
-version = 0.3.3
+version = 0.4
 author = Damien George

argparse/setup.py

@@ -4,17 +4,17 @@
 sys.path.pop(0)
 from setuptools import setup
 sys.path.append("..")
-import optimize_upip
+import sdist_upip
 
 setup(name='micropython-argparse',
-      version='0.3.3',
+      version='0.4',
       description='argparse module for MicroPython',
       long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
       url='https://github.com/micropython/micropython-lib',
       author='Damien George',
       author_email='[email protected]',
-      maintainer='MicroPython Developers',
+      maintainer='micropython-lib Developers',
       maintainer_email='[email protected]',
       license='MIT',
-      cmdclass={'optimize_upip': optimize_upip.OptimizeUpip},
+      cmdclass={'sdist': sdist_upip.sdist},
       py_modules=['argparse'])

argparse/test_argparse.py

@@ -44,3 +44,25 @@
 assert args.files1 == ["a", "b"] and args.files2 == []
 args = parser.parse_args(["a", "b", "c"])
 assert args.files1 == ["a", "b"] and args.files2 == ["c"]
+
+parser = argparse.ArgumentParser()
+parser.add_argument("a", nargs=2)
+parser.add_argument("-b")
+args, rest = parser.parse_known_args(["a", "b", "-b", "2"])
+assert args.a == ["a", "b"] and args.b == "2"
+assert rest == []
+args, rest = parser.parse_known_args(["-b", "2", "a", "b", "c"])
+assert args.a == ["a", "b"] and args.b == "2"
+assert rest == ["c"]
+args, rest = parser.parse_known_args(["a", "b", "-b", "2", "c"])
+assert args.a == ["a", "b"] and args.b == "2"
+assert rest == ["c"]
+args, rest = parser.parse_known_args(["-b", "2", "a", "b", "-", "c"])
+assert args.a == ["a", "b"] and args.b == "2"
+assert rest == ["-", "c"]
+args, rest = parser.parse_known_args(["a", "b", "-b", "2", "-", "x", "y"])
+assert args.a == ["a", "b"] and args.b == "2"
+assert rest == ["-", "x", "y"]
+args, rest = parser.parse_known_args(["a", "b", "c", "-b", "2", "--x", "5", "1"])
+assert args.a == ["a", "b"] and args.b == "2"
+assert rest == ["c", "--x", "5", "1"]

array/metadata.txt

@@ -0,0 +1,3 @@
+srctype = dummy
+type = module
+version = 0.0.0

array/setup.py

@@ -0,0 +1,20 @@
+import sys
+# Remove current dir from sys.path, otherwise setuptools will peek up our
+# module instead of system's.
+sys.path.pop(0)
+from setuptools import setup
+sys.path.append("..")
+import sdist_upip
+
+setup(name='micropython-array',
+      version='0.0.0',
+      description='Dummy array module for MicroPython',
+      long_description='This is a dummy implementation of a module for MicroPython standard library.\nIt contains zero or very little functionality, and primarily intended to\navoid import errors (using idea that even if an application imports a\nmodule, it may be not using it onevery code path, so may work at least\npartially). It is expected that more complete implementation of the module\nwill be provided later. Please help with the development if you are\ninterested in this module.',
+      url='https://github.com/micropython/micropython-lib',
+      author='micropython-lib Developers',
+      author_email='[email protected]',
+      maintainer='micropython-lib Developers',
+      maintainer_email='[email protected]',
+      license='MIT',
+      cmdclass={'sdist': sdist_upip.sdist},
+      py_modules=['array'])

asyncio/setup.py

@@ -4,17 +4,17 @@
 sys.path.pop(0)
 from setuptools import setup
 sys.path.append("..")
-import optimize_upip
+import sdist_upip
 
 setup(name='micropython-asyncio',
       version='0.0.0',
       description='Dummy asyncio module for MicroPython',
       long_description='This is a dummy implementation of a module for MicroPython standard library.\nIt contains zero or very little functionality, and primarily intended to\navoid import errors (using idea that even if an application imports a\nmodule, it may be not using it onevery code path, so may work at least\npartially). It is expected that more complete implementation of the module\nwill be provided later. Please help with the development if you are\ninterested in this module.',
       url='https://github.com/micropython/micropython-lib',
-      author='MicroPython Developers',
+      author='micropython-lib Developers',
       author_email='[email protected]',
-      maintainer='MicroPython Developers',
+      maintainer='micropython-lib Developers',
       maintainer_email='[email protected]',
       license='MIT',
-      cmdclass={'optimize_upip': optimize_upip.OptimizeUpip},
+      cmdclass={'sdist': sdist_upip.sdist},
       py_modules=['asyncio'])

asyncio_slow/asyncio_slow.py

@@ -47,7 +47,7 @@ def _cb():
         self.call_soon(_cb)
 
     def run_until_complete(self, coro):
-        t = async(coro)
+        t = ensure_future(coro)
         t.add_done_callback(lambda a: self.stop())
         self.run_forever()
 
@@ -109,7 +109,7 @@ def coroutine(f):
     return f
 
 
-def async(coro):
+def ensure_future(coro):
     if isinstance(coro, Future):
         return coro
     return Task(coro)
@@ -136,7 +136,7 @@ def wait(coro_list, loop=_def_event_loop):
     w = _Wait(len(coro_list))
 
     for c in coro_list:
-        t = async(c)
+        t = ensure_future(c)
         t.add_done_callback(lambda val: w._done())
 
     return w

asyncio_slow/test_chain.py renamed to asyncio_slow/example_chain.py

@@ -1,4 +1,4 @@
 srctype=cpython
 type=module
-version = 3.3.3-3
-depends = struct
+version = 3.3.3-4
+depends = binascii, re-pcre, struct