Handle .COLOR_DIFF in the same way as .DIFF (#1673)

[etc/vim.git] / setup.py

diff --git a/setup.py b/setup.py
index 7569d5105bbec017c0947adc36382fbb80be7b6c..12fde2568cfe55c554c87fdbde0c2947d89fd83f 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018 Łukasz Langa
+# Copyright (C) 2020 Łukasz Langa

 from setuptools import setup
 import sys
 import os
 from setuptools import setup
 import sys
 import os


@@ -11,9 +11,11 @@ sys.path.insert(0, str(CURRENT_DIR))  # for setuptools.build_meta
 
 
 def get_long_description() -> str:
 
 
 def get_long_description() -> str:

-    readme_md = CURRENT_DIR / "README.md"
-    with open(readme_md, encoding="utf8") as ld_file:
-        return ld_file.read()
+    return (
+        (CURRENT_DIR / "README.md").read_text(encoding="utf8")
+        + "\n\n"
+        + (CURRENT_DIR / "CHANGES.md").read_text(encoding="utf8")
+    )

 
 
 USE_MYPYC = False
 
 
 USE_MYPYC = False


@@ -26,14 +28,14 @@ if os.getenv("BLACK_USE_MYPYC", None) == "1":
 
 if USE_MYPYC:
     mypyc_targets = [
 
 if USE_MYPYC:
     mypyc_targets = [

-        "black.py",
-        "blib2to3/pytree.py",
-        "blib2to3/pygram.py",
-        "blib2to3/pgen2/parse.py",
-        "blib2to3/pgen2/grammar.py",
-        "blib2to3/pgen2/token.py",
-        "blib2to3/pgen2/driver.py",
-        "blib2to3/pgen2/pgen.py",
+        "src/black/__init__.py",
+        "src/blib2to3/pytree.py",
+        "src/blib2to3/pygram.py",
+        "src/blib2to3/pgen2/parse.py",
+        "src/blib2to3/pgen2/grammar.py",
+        "src/blib2to3/pgen2/token.py",
+        "src/blib2to3/pgen2/driver.py",
+        "src/blib2to3/pgen2/pgen.py",

     ]
 
     from mypyc.build import mypycify
     ]
 
     from mypyc.build import mypycify


@@ -46,7 +48,7 @@ else:
 setup(
     name="black",
     use_scm_version={
 setup(
     name="black",
     use_scm_version={

-        "write_to": "_black_version.py",
+        "write_to": "src/_black_version.py",

         "write_to_template": 'version = "{version}"\n',
     },
     description="The uncompromising code formatter.",
         "write_to_template": 'version = "{version}"\n',
     },
     description="The uncompromising code formatter.",


@@ -56,26 +58,30 @@ 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"},

     license="MIT",
     license="MIT",

-    py_modules=["black", "blackd", "_black_version"],
+    py_modules=["_black_version"],

     ext_modules=ext_modules,
     ext_modules=ext_modules,

-    packages=["blib2to3", "blib2to3.pgen2"],
-    package_data={"blib2to3": ["*.txt"]},
+    packages=["blackd", "black", "blib2to3", "blib2to3.pgen2", "black_primer"],
+    package_dir={"": "src"},
+    package_data={"blib2to3": ["*.txt"], "black": ["py.typed"]},

     python_requires=">=3.6",
     zip_safe=False,
     install_requires=[
     python_requires=">=3.6",
     zip_safe=False,
     install_requires=[

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

         "appdirs",
         "appdirs",

-        "toml>=0.9.4",
+        "toml>=0.10.1",

         "typed-ast>=1.4.0",
         "typed-ast>=1.4.0",

-        "regex",
+        "regex>=2020.1.8",

         "pathspec>=0.6, <1",
         "dataclasses>=0.6; python_version < '3.7'",
         "typing_extensions>=3.7.4",
         "mypy_extensions>=0.4.3",
     ],
         "pathspec>=0.6, <1",
         "dataclasses>=0.6; python_version < '3.7'",
         "typing_extensions>=3.7.4",
         "mypy_extensions>=0.4.3",
     ],

-    extras_require={"d": ["aiohttp>=3.3.2", "aiohttp-cors"]},
+    extras_require={
+        "d": ["aiohttp>=3.3.2", "aiohttp-cors"],
+        "colorama": ["colorama>=0.4.3"],
+    },

     test_suite="tests.test_black",
     classifiers=[
         "Development Status :: 4 - Beta",
     test_suite="tests.test_black",
     classifiers=[
         "Development Status :: 4 - Beta",


@@ -95,6 +101,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",

         ]
     },
 )
         ]
     },
 )