Simplify the #606 patch

[etc/vim.git] / setup.py

diff --git a/setup.py b/setup.py
index 67a1e7657918f74adc3414f189d08e6347a4b073..620124facc39b25631faf5c61654e91522262378 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -36,24 +36,31 @@ setup(
     author_email="lukasz@langa.pl",
     url="https://github.com/ambv/black",
     license="MIT",
     author_email="lukasz@langa.pl",
     url="https://github.com/ambv/black",
     license="MIT",

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

     packages=["blib2to3", "blib2to3.pgen2"],
     package_data={"blib2to3": ["*.txt"]},
     python_requires=">=3.6",
     zip_safe=False,
     packages=["blib2to3", "blib2to3.pgen2"],
     package_data={"blib2to3": ["*.txt"]},
     python_requires=">=3.6",
     zip_safe=False,

-    install_requires=["click", "attrs>=17.4.0", "appdirs"],
+    install_requires=["click>=6.5", "attrs>=18.1.0", "appdirs", "toml>=0.9.4"],
+    extras_require={"d": ["aiohttp>=3.3.2", "aiohttp-cors"]},

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

-        "Development Status :: 3 - Alpha",
+        "Development Status :: 4 - Beta",

         "Environment :: Console",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3.6",
         "Environment :: Console",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3.6",

+        "Programming Language :: Python :: 3.7",

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

-    entry_points={"console_scripts": ["black=black:main"]},
+    entry_points={
+        "console_scripts": [
+            "black=black:patched_main",
+            "blackd=blackd:patched_main [d]",
+        ]
+    },

 )
 )