Add a missing space in Python 2 deprecation (GH-2590)

[etc/vim.git] / setup.py

diff --git a/setup.py b/setup.py
index c97dd35fe28609378358d6ae5a4ff6033e4788cc..de84dc37bb8af7869203eff1b38f68b6fb0d7a07 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,9 @@
 # Copyright (C) 2020 Łukasz Langa
 # Copyright (C) 2020 Łukasz Langa

-from setuptools import setup
+from setuptools import setup, find_packages

 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,29 +58,39 @@ 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", "black_primer"],
+    packages=find_packages(where="src"),

     package_dir={"": "src"},
     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",
     zip_safe=False,
     install_requires=[
         "click>=7.1.2",

-        "appdirs",
-        "toml>=0.10.1",
-        "typed-ast>=1.4.2",
+        "platformdirs>=2",
+        "tomli>=0.2.6,<2.0.0",
+        "typed-ast>=1.4.2; python_version < '3.8'",

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

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

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

-        "typing_extensions>=3.7.4",
+        "typing_extensions>=3.10.0.0",
+        # 3.10.0.1 is broken on at least Python 3.10,
+        # https://github.com/python/typing/issues/865
+        "typing_extensions!=3.10.0.1; python_version >= '3.10'",

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

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

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

+        "python2": ["typed-ast>=1.4.3"],
+        "uvloop": ["uvloop>=0.15.2"],
+        "jupyter": ["ipython>=7.8.0", "tokenize-rt>=3.2.0"],

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