Use g:pymode_python-defined interpreter if defined and exists, otherwise use existing...

[etc/vim.git] / setup.py

diff --git a/setup.py b/setup.py
index 4e9a5c97acbf02f0defa01f7aead84265db754b7..b12d4ac9a7092251e11fc28f98e26336a76ad822 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -10,17 +10,18 @@ from pathlib import Path  # noqa E402
 CURRENT_DIR = Path(__file__).parent
 
 
 CURRENT_DIR = Path(__file__).parent
 
 

-def get_long_description():
+def get_long_description() -> str:

     readme_md = CURRENT_DIR / "README.md"
     with open(readme_md, encoding="utf8") as ld_file:
         return ld_file.read()
 
 
     readme_md = CURRENT_DIR / "README.md"
     with open(readme_md, encoding="utf8") as ld_file:
         return ld_file.read()
 
 

-def get_version():
+def get_version() -> str:

     black_py = CURRENT_DIR / "black.py"
     _version_re = re.compile(r"__version__\s+=\s+(?P<version>.*)")
     with open(black_py, "r", encoding="utf8") as f:
     black_py = CURRENT_DIR / "black.py"
     _version_re = re.compile(r"__version__\s+=\s+(?P<version>.*)")
     with open(black_py, "r", encoding="utf8") as f:

-        version = _version_re.search(f.read()).group("version")
+        match = _version_re.search(f.read())
+        version = match.group("version") if match is not None else '"unknown"'

     return str(ast.literal_eval(version))
 
 
     return str(ast.literal_eval(version))
 
 


@@ -33,26 +34,33 @@ setup(
     keywords="automation formatter yapf autopep8 pyfmt gofmt rustfmt",
     author="Łukasz Langa",
     author_email="lukasz@langa.pl",
     keywords="automation formatter yapf autopep8 pyfmt gofmt rustfmt",
     author="Łukasz Langa",
     author_email="lukasz@langa.pl",

-    url="https://github.com/ambv/black",
+    url="https://github.com/python/black",

     license="MIT",
     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]",
+        ]
+    },

 )
 )