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 0f9141d7406f0f357a251e7eae5bd552aaf40796..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
 


@@ -10,49 +8,57 @@ from pathlib import Path  # noqa E402
 CURRENT_DIR = Path(__file__).parent
 
 
 CURRENT_DIR = Path(__file__).parent
 
 

-def get_long_description():
-    readme_md = CURRENT_DIR / 'README.md'
-    with open(readme_md, encoding='utf8') as ld_file:
+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 ld_file.read()
 
 

-def get_version():
-    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:
-        version = _version_re.search(f.read()).group('version')
-    return str(ast.literal_eval(version))
-
-

 setup(
 setup(

-    name='black',
-    version=get_version(),
+    name="black",
+    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",
     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',
-    license='MIT',
-    py_modules=['black'],
-    packages=['blib2to3', 'blib2to3.pgen2'],
-    package_data={'blib2to3': ['*.txt']},
+    keywords="automation formatter yapf autopep8 pyfmt gofmt rustfmt",
+    author="Łukasz Langa",
+    author_email="lukasz@langa.pl",
+    url="https://github.com/psf/black",
+    license="MIT",
+    py_modules=["black", "blackd", "_version"],
+    packages=["blib2to3", "blib2to3.pgen2"],
+    package_data={"blib2to3": ["*.txt"]},

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

-    install_requires=['click', 'attrs>=17.4.0'],
-    test_suite='tests.test_black',
+    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=[
     classifiers=[

-        'Development Status :: 3 - Alpha',
-        'Environment :: Console',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: MIT License',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3 :: Only',
-        'Topic :: Software Development :: Libraries :: Python Modules',
-        'Topic :: Software Development :: Quality Assurance',
+        "Development Status :: 4 - Beta",
+        "Environment :: Console",
+        "Intended Audience :: Developers",
+        "License :: OSI Approved :: MIT License",
+        "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",

     ],
     ],

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

 )
 )