Fix a crash when `# fmt: on` is used on a different block level than `# fmt: off...

[etc/vim.git] / setup.py

diff --git a/setup.py b/setup.py
index 7022b24345c66a7fb162faa3421d8ee87363b522..2cf455573c93b37cf470e78afd6a4611efdb04f8 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,8 @@
 # Copyright (C) 2020 Łukasz Langa
 # Copyright (C) 2020 Łukasz Langa

-from setuptools import setup, find_packages
-import sys

 import os
 import os

+import sys
+
+from setuptools import find_packages, setup

 
 assert sys.version_info >= (3, 6, 2), "black requires Python 3.6.2+"
 from pathlib import Path  # noqa E402
 
 assert sys.version_info >= (3, 6, 2), "black requires Python 3.6.2+"
 from pathlib import Path  # noqa E402


@@ -58,7 +59,7 @@ if USE_MYPYC:
         "black/__main__.py",
     ]
     discovered = []
         "black/__main__.py",
     ]
     discovered = []

-    # black-primer and blackd have no good reason to be compiled.
+    # There's no good reason for blackd to be compiled.

     discovered.extend(find_python_files(src / "black"))
     discovered.extend(find_python_files(src / "blib2to3"))
     mypyc_targets = [
     discovered.extend(find_python_files(src / "black"))
     discovered.extend(find_python_files(src / "blib2to3"))
     mypyc_targets = [


@@ -66,7 +67,10 @@ if USE_MYPYC:
     ]
 
     opt_level = os.getenv("MYPYC_OPT_LEVEL", "3")
     ]
 
     opt_level = os.getenv("MYPYC_OPT_LEVEL", "3")

-    ext_modules = mypycify(mypyc_targets, opt_level=opt_level, verbose=True)
+    debug_level = os.getenv("MYPYC_DEBUG_LEVEL", "3")
+    ext_modules = mypycify(
+        mypyc_targets, opt_level=opt_level, debug_level=debug_level, verbose=True
+    )

 else:
     ext_modules = []
 
 else:
     ext_modules = []
 


@@ -92,34 +96,27 @@ setup(
     package_data={
         "blib2to3": ["*.txt"],
         "black": ["py.typed"],
     package_data={
         "blib2to3": ["*.txt"],
         "black": ["py.typed"],

-        "black_primer": ["primer.json"],

     },
     python_requires=">=3.6.2",
     zip_safe=False,
     install_requires=[
     },
     python_requires=">=3.6.2",
     zip_safe=False,
     install_requires=[

-        "click>=7.1.2",
+        "click>=8.0.0",

         "platformdirs>=2",
         "platformdirs>=2",

-        "tomli>=0.2.6,<2.0.0",
+        "tomli>=1.1.0; python_full_version < '3.11.0a7'",

         "typed-ast>=1.4.2; python_version < '3.8' and implementation_name == 'cpython'",
         "typed-ast>=1.4.2; python_version < '3.8' and implementation_name == 'cpython'",

-        "regex>=2020.1.8",
-        "pathspec>=0.9.0, <1",
+        "pathspec>=0.9.0",

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

-        "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'",
+        "typing_extensions>=3.10.0.0; python_version < '3.10'",

         "mypy_extensions>=0.4.3",
     ],
     extras_require={
         "d": ["aiohttp>=3.7.4"],
         "colorama": ["colorama>=0.4.3"],
         "mypy_extensions>=0.4.3",
     ],
     extras_require={
         "d": ["aiohttp>=3.7.4"],
         "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"],
     },
         "uvloop": ["uvloop>=0.15.2"],
         "jupyter": ["ipython>=7.8.0", "tokenize-rt>=3.2.0"],
     },

-    test_suite="tests.test_black",

     classifiers=[
     classifiers=[

-        "Development Status :: 4 - Beta",
+        "Development Status :: 5 - Production/Stable",

         "Environment :: Console",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: MIT License",
         "Environment :: Console",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: MIT License",


@@ -130,6 +127,7 @@ setup(
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",

+        "Programming Language :: Python :: 3.11",

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


@@ -138,7 +136,6 @@ 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",

         ]
     },
 )
         ]
     },
 )