Address pre-existing trailing commas when not in the rightmost bracket pair

[etc/vim.git] / setup.py

diff --git a/setup.py b/setup.py
index b12d4ac9a7092251e11fc28f98e26336a76ad822..bff439c6d8cc532fe41f66d57f24de379a4b8109 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,48 +1,88 @@
-# Copyright (C) 2018 Łukasz Langa
-import ast
-import re
+# Copyright (C) 2020 Łukasz Langa

 from setuptools import setup
 import sys
 from setuptools import setup
 import sys

+import os

 
 assert sys.version_info >= (3, 6, 0), "black requires Python 3.6+"
 from pathlib import Path  # noqa E402
 
 CURRENT_DIR = Path(__file__).parent
 
 assert sys.version_info >= (3, 6, 0), "black requires Python 3.6+"
 from pathlib import Path  # noqa E402
 
 CURRENT_DIR = Path(__file__).parent

+sys.path.insert(0, str(CURRENT_DIR))  # for setuptools.build_meta

 
 
 def get_long_description() -> str:
 
 
 def get_long_description() -> str:

-    readme_md = CURRENT_DIR / "README.md"
-    with open(readme_md, encoding="utf8") as ld_file:
-        return ld_file.read()
+    return (
+        (CURRENT_DIR / "README.md").read_text(encoding="utf8")
+        + "\n\n"
+        + (CURRENT_DIR / "CHANGES.md").read_text(encoding="utf8")
+    )

 
 
 
 

-def get_version() -> str:
-    black_py = CURRENT_DIR / "black.py"
-    _version_re = re.compile(r"__version__\s+=\s+(?P<version>.*)")
-    with open(black_py, "r", encoding="utf8") as f:
-        match = _version_re.search(f.read())
-        version = match.group("version") if match is not None else '"unknown"'
-    return str(ast.literal_eval(version))
+USE_MYPYC = False
+# To compile with mypyc, a mypyc checkout must be present on the PYTHONPATH
+if len(sys.argv) > 1 and sys.argv[1] == "--use-mypyc":
+    sys.argv.pop(1)
+    USE_MYPYC = True
+if os.getenv("BLACK_USE_MYPYC", None) == "1":
+    USE_MYPYC = True

 
 

+if USE_MYPYC:
+    mypyc_targets = [
+        "src/black/__init__.py",
+        "src/blib2to3/pytree.py",
+        "src/blib2to3/pygram.py",
+        "src/blib2to3/pgen2/parse.py",
+        "src/blib2to3/pgen2/grammar.py",
+        "src/blib2to3/pgen2/token.py",
+        "src/blib2to3/pgen2/driver.py",
+        "src/blib2to3/pgen2/pgen.py",
+    ]
+
+    from mypyc.build import mypycify
+
+    opt_level = os.getenv("MYPYC_OPT_LEVEL", "3")
+    ext_modules = mypycify(mypyc_targets, opt_level=opt_level)
+else:
+    ext_modules = []

 
 setup(
     name="black",
 
 setup(
     name="black",

-    version=get_version(),
+    use_scm_version={
+        "write_to": "src/_black_version.py",
+        "write_to_template": 'version = "{version}"\n',
+    },

     description="The uncompromising code formatter.",
     long_description=get_long_description(),
     long_description_content_type="text/markdown",
     keywords="automation formatter yapf autopep8 pyfmt gofmt rustfmt",
     author="Łukasz Langa",
     author_email="lukasz@langa.pl",
     description="The uncompromising code formatter.",
     long_description=get_long_description(),
     long_description_content_type="text/markdown",
     keywords="automation formatter yapf autopep8 pyfmt gofmt rustfmt",
     author="Łukasz Langa",
     author_email="lukasz@langa.pl",

-    url="https://github.com/python/black",
+    url="https://github.com/psf/black",
+    project_urls={"Changelog": "https://github.com/psf/black/blob/master/CHANGES.md"},

     license="MIT",
     license="MIT",

-    py_modules=["black", "blackd"],
-    packages=["blib2to3", "blib2to3.pgen2"],
-    package_data={"blib2to3": ["*.txt"]},
+    py_modules=["_black_version"],
+    ext_modules=ext_modules,
+    packages=["blackd", "black", "blib2to3", "blib2to3.pgen2", "black_primer"],
+    package_dir={"": "src"},
+    package_data={"blib2to3": ["*.txt"], "black": ["py.typed"]},

     python_requires=">=3.6",
     zip_safe=False,
     python_requires=">=3.6",
     zip_safe=False,

-    install_requires=["click>=6.5", "attrs>=18.1.0", "appdirs", "toml>=0.9.4"],
-    extras_require={"d": ["aiohttp>=3.3.2", "aiohttp-cors"]},
+    install_requires=[
+        "click>=6.5",
+        "attrs>=18.1.0",
+        "appdirs",
+        "toml>=0.9.4",
+        "typed-ast>=1.4.0",
+        "regex>=2020.1.8",
+        "pathspec>=0.6, <1",
+        "dataclasses>=0.6; python_version < '3.7'",
+        "typing_extensions>=3.7.4",
+        "mypy_extensions>=0.4.3",
+    ],
+    extras_require={
+        "d": ["aiohttp>=3.3.2", "aiohttp-cors"],
+        "colorama": ["colorama>=0.4.3"],
+    },

     test_suite="tests.test_black",
     classifiers=[
         "Development Status :: 4 - Beta",
     test_suite="tests.test_black",
     classifiers=[
         "Development Status :: 4 - Beta",


@@ -53,6 +93,7 @@ setup(
         "Programming Language :: Python",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",

+        "Programming Language :: Python :: 3.8",

         "Programming Language :: Python :: 3 :: Only",
         "Topic :: Software Development :: Libraries :: Python Modules",
         "Topic :: Software Development :: Quality Assurance",
         "Programming Language :: Python :: 3 :: Only",
         "Topic :: Software Development :: Libraries :: Python Modules",
         "Topic :: Software Development :: Quality Assurance",


@@ -61,6 +102,7 @@ setup(
         "console_scripts": [
             "black=black:patched_main",
             "blackd=blackd:patched_main [d]",
         "console_scripts": [
             "black=black:patched_main",
             "blackd=blackd:patched_main [d]",

+            "black-primer=black_primer.cli:main",

         ]
     },
 )
         ]
     },
 )