Fix issue with type comments on lines with trailing commas (#1058)

[etc/vim.git] / setup.py

diff --git a/setup.py b/setup.py
index efd4ef93a6d74f91f63a8360e409830980d00b82..d4e940584ed8c60e94b8956ecc2da611f217128a 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,4 @@
 # Copyright (C) 2018 Łukasz Langa
 # Copyright (C) 2018 Łukasz Langa

-import ast
-import re

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


@@ -16,32 +14,33 @@ def get_long_description() -> str:
         return ld_file.read()
 
 
         return ld_file.read()
 
 

-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))
-
-

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

-    version=get_version(),
+    use_scm_version={
+        "write_to": "_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/ambv/black",
+    url="https://github.com/psf/black",

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

-    py_modules=["black"],
+    py_modules=["black", "blackd", "_version"],

     packages=["blib2to3", "blib2to3.pgen2"],
     package_data={"blib2to3": ["*.txt"]},
     python_requires=">=3.6",
     zip_safe=False,
     packages=["blib2to3", "blib2to3.pgen2"],
     package_data={"blib2to3": ["*.txt"]},
     python_requires=">=3.6",
     zip_safe=False,

-    install_requires=["click>=6.5", "attrs>=17.4.0", "appdirs"],
+    install_requires=[
+        "click>=6.5",
+        "attrs>=18.1.0",
+        "appdirs",
+        "toml>=0.9.4",
+        "typed-ast>=1.3.1",
+    ],
+    extras_require={"d": ["aiohttp>=3.3.2", "aiohttp-cors"]},

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


@@ -51,9 +50,15 @@ setup(
         "Operating System :: OS Independent",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3.6",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3.6",

+        "Programming Language :: Python :: 3.7",

         "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",
     ],

-    entry_points={"console_scripts": ["black=black:main"]},
+    entry_points={
+        "console_scripts": [
+            "black=black:patched_main",
+            "blackd=blackd:patched_main [d]",
+        ]
+    },

 )
 )