Consolidate test CI and add concurrency limits (#3189)

[etc/vim.git] / setup.py

diff --git a/setup.py b/setup.py
index 6b5b957e96f955b8db227fee0bcc5142b82974f8..3accdf433bc430f3f37e829dc6c2ede514107020 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 = [


@@ -92,14 +93,13 @@ 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=[
         "click>=8.0.0",
         "platformdirs>=2",
     },
     python_requires=">=3.6.2",
     zip_safe=False,
     install_requires=[
         "click>=8.0.0",
         "platformdirs>=2",

-        "tomli>=1.1.0; python_version < '3.11'",
+        "tomli>=1.1.0; python_full_version < '3.11.0a7'",

         "typed-ast>=1.4.2; python_version < '3.8' and implementation_name == 'cpython'",
         "pathspec>=0.9.0",
         "dataclasses>=0.6; python_version < '3.7'",
         "typed-ast>=1.4.2; python_version < '3.8' and implementation_name == 'cpython'",
         "pathspec>=0.9.0",
         "dataclasses>=0.6; python_version < '3.7'",


@@ -132,7 +132,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",

         ]
     },
 )
         ]
     },
 )