add test configurations that don't contain python2 optional install (#2190)

[etc/vim.git] / setup.py

diff --git a/setup.py b/setup.py
index 48160568265abd20402e7f6fd58b72710903fa2e..f1792a46fe85e4ebd8a67b571a7b34fcade8678f 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


@@ -64,16 +64,20 @@ setup(
     ext_modules=ext_modules,
     packages=["blackd", "black", "blib2to3", "blib2to3.pgen2", "black_primer"],
     package_dir={"": "src"},
     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",
+    package_data={
+        "blib2to3": ["*.txt"],
+        "black": ["py.typed"],
+        "black_primer": ["primer.json"],
+    },
+    python_requires=">=3.6.2",

     zip_safe=False,
     install_requires=[
         "click>=7.1.2",
         "appdirs",
         "toml>=0.10.1",
     zip_safe=False,
     install_requires=[
         "click>=7.1.2",
         "appdirs",
         "toml>=0.10.1",

-        "typed-ast>=1.4.2",
+        "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'",
         "typing_extensions>=3.7.4; python_version < '3.8'",
         "mypy_extensions>=0.4.3",
         "dataclasses>=0.6; python_version < '3.7'",
         "typing_extensions>=3.7.4; python_version < '3.8'",
         "mypy_extensions>=0.4.3",


@@ -81,6 +85,7 @@ setup(
     extras_require={
         "d": ["aiohttp>=3.3.2", "aiohttp-cors"],
         "colorama": ["colorama>=0.4.3"],
     extras_require={
         "d": ["aiohttp>=3.3.2", "aiohttp-cors"],
         "colorama": ["colorama>=0.4.3"],

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

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