Fix internal error when FORCE_OPTIONAL_PARENTHESES feature is enabled (#2332)

[etc/vim.git] / setup.py

diff --git a/setup.py b/setup.py
index 3d14fd425fbbbc7ff5c2b3828f31d3482254922d..5549ae353423853023441343b82568e348d825ef 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ from setuptools import setup
 import sys
 import os
 
 import sys
 import os
 

-assert sys.version_info >= (3, 6, 0), "black requires Python 3.6+"
+assert sys.version_info >= (3, 6, 2), "black requires Python 3.6.2+"

 from pathlib import Path  # noqa E402
 
 CURRENT_DIR = Path(__file__).parent
 from pathlib import Path  # noqa E402
 
 CURRENT_DIR = Path(__file__).parent


@@ -58,30 +58,35 @@ setup(
     author="Łukasz Langa",
     author_email="lukasz@langa.pl",
     url="https://github.com/psf/black",
     author="Łukasz Langa",
     author_email="lukasz@langa.pl",
     url="https://github.com/psf/black",

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

     license="MIT",
     py_modules=["_black_version"],
     ext_modules=ext_modules,
     license="MIT",
     py_modules=["_black_version"],
     ext_modules=ext_modules,

-    packages=["blackd", "black", "blib2to3", "blib2to3.pgen2"],
+    packages=["blackd", "black", "blib2to3", "blib2to3.pgen2", "black_primer"],

     package_dir={"": "src"},
     package_dir={"": "src"},

-    package_data={"blib2to3": ["*.txt"]},
-    python_requires=">=3.6",
+    package_data={
+        "blib2to3": ["*.txt"],
+        "black": ["py.typed"],
+        "black_primer": ["primer.json"],
+    },
+    python_requires=">=3.6.2",

     zip_safe=False,
     install_requires=[
     zip_safe=False,
     install_requires=[

-        "click>=6.5",
-        "attrs>=18.1.0",
+        "click>=7.1.2",

         "appdirs",
         "appdirs",

-        "toml>=0.9.4",
-        "typed-ast>=1.4.0",
+        "toml>=0.10.1",
+        "typed-ast>=1.4.2; python_version < '3.8'",

         "regex>=2020.1.8",
         "regex>=2020.1.8",

-        "pathspec>=0.6, <1",
+        "pathspec>=0.8.1, <1",

         "dataclasses>=0.6; python_version < '3.7'",
         "dataclasses>=0.6; python_version < '3.7'",

-        "typing_extensions>=3.7.4",
+        "typing_extensions>=3.7.4; python_version < '3.8'",

         "mypy_extensions>=0.4.3",
     ],
     extras_require={
         "mypy_extensions>=0.4.3",
     ],
     extras_require={

-        "d": ["aiohttp>=3.3.2", "aiohttp-cors"],
+        "d": ["aiohttp>=3.6.0", "aiohttp-cors>=0.4.0"],

         "colorama": ["colorama>=0.4.3"],
         "colorama": ["colorama>=0.4.3"],

+        "python2": ["typed-ast>=1.4.2"],
+        "uvloop": ["uvloop>=0.15.2"],

     },
     test_suite="tests.test_black",
     classifiers=[
     },
     test_suite="tests.test_black",
     classifiers=[


@@ -94,6 +99,7 @@ setup(
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",

+        "Programming Language :: Python :: 3.9",

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


@@ -102,6 +108,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",

         ]
     },
 )
         ]
     },
 )