Update links to macropy3 wrapper

Technologicat · Technologicat · commit 5f56e6b42af4 · 2019-11-21T16:30:33.000+02:00
diff --git a/doc/macros.md b/doc/macros.md
@@ -2,7 +2,7 @@
 
 Our extensions to the Python language are built on [MacroPy](https://github.com/azazel75/macropy), from the PyPI package ``macropy3``.
 
-Because in Python macro expansion occurs *at import time*, Python programs whose main module uses macros, such as [our unit tests that contain usage examples](../unpythonic/syntax/test/), cannot be run directly. Instead, run them via the included [generic MacroPy3 bootstrapper](macropy3). For convenience, ``setup.py`` installs this bootstrapper.
+Because in Python macro expansion occurs *at import time*, Python programs whose main module uses macros, such as [our unit tests that contain usage examples](../unpythonic/syntax/test/), cannot be run directly. Instead, run them via the included [generic MacroPy3 bootstrapper](../macropy3). For convenience, ``setup.py`` installs this bootstrapper.
 
 **The bootstrapper is moving!** *Starting with `unpythonic` v0.14.1, it is already distributed in [imacropy](https://github.com/Technologicat/imacropy) [[PyPI](https://pypi.org/project/imacropy/)], which is its new, permanent home. It will be removed from `unpythonic` starting in v0.15.0. The reason is the bootstrapper is a general add-on for MacroPy, not specific to `unpythonic`.*
 
@@ -1084,7 +1084,7 @@ x0, ..., *xs = call_cc[f(...) if p else g(...)]
 call_cc[f(...) if p else g(...)]
 ```
 
-*NOTE*: ``*xs`` may need to be written as ``*xs,`` in order to explicitly make the LHS into a tuple. The variant without the comma seems to work when run with [the bootstrapper](macropy3) from a ``.py``, but fails in code run interactively in [the IPython+MacroPy console](https://github.com/azazel75/macropy/pull/20).
+*NOTE*: ``*xs`` may need to be written as ``*xs,`` in order to explicitly make the LHS into a tuple. The variant without the comma seems to work when run with [the bootstrapper](../macropy3) from a ``.py``, but fails in code run interactively in [the IPython+MacroPy console](https://github.com/azazel75/macropy/pull/20).
 
 *NOTE*: ``f()`` and ``g()`` must be **literal function calls**. Sneaky trickery (such as calling indirectly via ``unpythonic.misc.call`` or ``unpythonic.fun.curry``) is not supported. (The ``prefix`` and ``curry`` macros, however, **are** supported; just order the block macros as shown in the final section of this README.) This limitation is for simplicity; the ``call_cc[]`` needs to patch the ``cc=...`` kwarg of the call being made.
 
diff --git a/runtests.py b/runtests.py
@@ -56,7 +56,7 @@ def main():
     else:
         totalfails += runtests("macros",
                                listtestmodules(os.path.join("unpythonic", "syntax", "test")),
-                               [os.path.join("macro_extras", "macropy3"), "-m"])
+                               ["macropy3", "-m"])
 
     if not totalfails:
         print(CPASS + "*** ALL OK ***" + CEND)
diff --git a/setup.py b/setup.py
@@ -26,15 +26,15 @@
 #
 # This is also the top level of its source tree, relative to the top-level project directory setup.py resides in.
 #
-libname="unpythonic"
+libname = "unpythonic"
 
 # Short description for package list on PyPI
 #
-SHORTDESC="Supercharge your Python with parts of Lisp and Haskell."
+SHORTDESC = "Supercharge your Python with parts of Lisp and Haskell."
 
 # Long description for package homepage on PyPI
 #
-DESC="""We provide missing features for Python, mainly from the list processing
+DESC = """We provide missing features for Python, mainly from the list processing
 tradition, but with some haskellisms mixed in. We place a special emphasis on
 **clear, pythonic syntax**.
 
@@ -255,14 +255,14 @@ def my_yield(value, cc):
 # Set up data files for packaging.
 #
 # Directories (relative to the top-level directory where setup.py resides) in which to look for data files.
-datadirs  = ()
+datadirs = ()
 
 # File extensions to be considered as data files. (Literal, no wildcards.)
-dataexts  = (".py", ".ipynb",  ".sh",  ".lyx", ".tex", ".txt", ".pdf")
+dataexts = (".py", ".ipynb", ".sh", ".lyx", ".tex", ".txt", ".pdf")
 
 # Standard documentation to detect (and package if it exists).
 #
-standard_docs     = ["README", "LICENSE", "TODO", "CHANGELOG", "AUTHORS"]  # just the basename without file extension
+standard_docs = ["README", "LICENSE", "TODO", "CHANGELOG", "AUTHORS"]  # just the basename without file extension
 standard_doc_exts = [".md", ".rst", ".txt", ""]  # commonly .md for GitHub projects, but other projects may use .rst or .txt (or even blank).
 
 #########################################################
@@ -287,10 +287,10 @@ def my_yield(value, cc):
 detected_docs = []
 for docname in standard_docs:
     for ext in standard_doc_exts:
-        filename = "".join( (docname, ext) )  # relative to the directory in which setup.py resides
+        filename = "".join((docname, ext))  # relative to the directory in which setup.py resides
         if os.path.isfile(filename):
             detected_docs.append(filename)
-datafiles.append( ('.', detected_docs) )
+datafiles.append(('.', detected_docs))
 
 # Extract __version__ from the package __init__.py
 # (since it's not a good idea to actually run __init__.py during the build process).
@@ -307,23 +307,23 @@ def my_yield(value, cc):
                 version = ast.parse(line).body[0].value.s
                 break
         else:
-            print( "WARNING: Version information not found in '%s', using placeholder '%s'" % (init_py_path, version), file=sys.stderr )
+            print("WARNING: Version information not found in '%s', using placeholder '%s'" % (init_py_path, version), file=sys.stderr)
 except FileNotFoundError:
-    print( "WARNING: Could not find file '%s', using placeholder version information '%s'" % (init_py_path, version), file=sys.stderr )
+    print("WARNING: Could not find file '%s', using placeholder version information '%s'" % (init_py_path, version), file=sys.stderr)
 
 #########################################################
 # Call setup()
 #########################################################
 
 setup(
-    name = "unpythonic",
-    version = version,
-    author = "Juha Jeronen",
-    author_email = "juha.m.jeronen@gmail.com",
-    url = "https://github.com/Technologicat/unpythonic",
+    name="unpythonic",
+    version=version,
+    author="Juha Jeronen",
+    author_email="juha.m.jeronen@gmail.com",
+    url="https://github.com/Technologicat/unpythonic",
 
-    description = SHORTDESC,
-    long_description = DESC,
+    description=SHORTDESC,
+    long_description=DESC,
 
     license = "BSD",
 
@@ -367,7 +367,7 @@ def my_yield(value, cc):
     # This **does not** automatically recurse into subpackages, so they must also be declared.
     #
     packages = ["unpythonic", "unpythonic.syntax"],
-    scripts = ["macro_extras/macropy3"],
+    scripts = ["macropy3"],
 
     zip_safe = False,  # macros are not zip safe, because the zip importer fails to find sources, and MacroPy needs them.
 
