Blacken top level *.py (#25621)

* Blacken top level *.py

* Tolerate double quotes too in setup.py dependency extraction
This commit is contained in:
Ville Skyttä 2019-08-01 18:30:49 +03:00 committed by Paulus Schoutsen
parent ceac35797e
commit 6b22dbcd0b
3 changed files with 42 additions and 47 deletions

View File

@ -7,4 +7,4 @@ black \
--check \ --check \
--fast \ --fast \
--quiet \ --quiet \
homeassistant tests script homeassistant tests script *.py

View File

@ -215,7 +215,7 @@ def core_requirements():
"""Gather core requirements out of setup.py.""" """Gather core requirements out of setup.py."""
with open("setup.py") as inp: with open("setup.py") as inp:
reqs_raw = re.search(r"REQUIRES = \[(.*?)\]", inp.read(), re.S).group(1) reqs_raw = re.search(r"REQUIRES = \[(.*?)\]", inp.read(), re.S).group(1)
return re.findall(r"'(.*?)'", reqs_raw) return [x[1] for x in re.findall(r"(['\"])(.*?)\1", reqs_raw)]
def gather_recursive_requirements(domain, seen=None): def gather_recursive_requirements(domain, seen=None):

View File

@ -5,55 +5,54 @@ from setuptools import setup, find_packages
import homeassistant.const as hass_const import homeassistant.const as hass_const
PROJECT_NAME = 'Home Assistant' PROJECT_NAME = "Home Assistant"
PROJECT_PACKAGE_NAME = 'homeassistant' PROJECT_PACKAGE_NAME = "homeassistant"
PROJECT_LICENSE = 'Apache License 2.0' PROJECT_LICENSE = "Apache License 2.0"
PROJECT_AUTHOR = 'The Home Assistant Authors' PROJECT_AUTHOR = "The Home Assistant Authors"
PROJECT_COPYRIGHT = ' 2013-{}, {}'.format(dt.now().year, PROJECT_AUTHOR) PROJECT_COPYRIGHT = " 2013-{}, {}".format(dt.now().year, PROJECT_AUTHOR)
PROJECT_URL = 'https://home-assistant.io/' PROJECT_URL = "https://home-assistant.io/"
PROJECT_EMAIL = 'hello@home-assistant.io' PROJECT_EMAIL = "hello@home-assistant.io"
PROJECT_GITHUB_USERNAME = 'home-assistant' PROJECT_GITHUB_USERNAME = "home-assistant"
PROJECT_GITHUB_REPOSITORY = 'home-assistant' PROJECT_GITHUB_REPOSITORY = "home-assistant"
PYPI_URL = 'https://pypi.python.org/pypi/{}'.format(PROJECT_PACKAGE_NAME) PYPI_URL = "https://pypi.python.org/pypi/{}".format(PROJECT_PACKAGE_NAME)
GITHUB_PATH = '{}/{}'.format( GITHUB_PATH = "{}/{}".format(PROJECT_GITHUB_USERNAME, PROJECT_GITHUB_REPOSITORY)
PROJECT_GITHUB_USERNAME, PROJECT_GITHUB_REPOSITORY) GITHUB_URL = "https://github.com/{}".format(GITHUB_PATH)
GITHUB_URL = 'https://github.com/{}'.format(GITHUB_PATH)
DOWNLOAD_URL = '{}/archive/{}.zip'.format(GITHUB_URL, hass_const.__version__) DOWNLOAD_URL = "{}/archive/{}.zip".format(GITHUB_URL, hass_const.__version__)
PROJECT_URLS = { PROJECT_URLS = {
'Bug Reports': '{}/issues'.format(GITHUB_URL), "Bug Reports": "{}/issues".format(GITHUB_URL),
'Dev Docs': 'https://developers.home-assistant.io/', "Dev Docs": "https://developers.home-assistant.io/",
'Discord': 'https://discordapp.com/invite/c5DvZ4e', "Discord": "https://discordapp.com/invite/c5DvZ4e",
'Forum': 'https://community.home-assistant.io/', "Forum": "https://community.home-assistant.io/",
} }
PACKAGES = find_packages(exclude=['tests', 'tests.*']) PACKAGES = find_packages(exclude=["tests", "tests.*"])
REQUIRES = [ REQUIRES = [
'aiohttp==3.5.4', "aiohttp==3.5.4",
'astral==1.10.1', "astral==1.10.1",
'async_timeout==3.0.1', "async_timeout==3.0.1",
'attrs==19.1.0', "attrs==19.1.0",
'bcrypt==3.1.7', "bcrypt==3.1.7",
'certifi>=2019.6.16', "certifi>=2019.6.16",
'importlib-metadata==0.18', "importlib-metadata==0.18",
'jinja2>=2.10.1', "jinja2>=2.10.1",
'PyJWT==1.7.1', "PyJWT==1.7.1",
# PyJWT has loose dependency. We want the latest one. # PyJWT has loose dependency. We want the latest one.
'cryptography==2.7', "cryptography==2.7",
'pip>=8.0.3', "pip>=8.0.3",
'python-slugify==3.0.2', "python-slugify==3.0.2",
'pytz>=2019.01', "pytz>=2019.01",
'pyyaml==5.1.1', "pyyaml==5.1.1",
'requests==2.22.0', "requests==2.22.0",
'ruamel.yaml==0.15.99', "ruamel.yaml==0.15.99",
'voluptuous==0.11.5', "voluptuous==0.11.5",
'voluptuous-serialize==2.1.0', "voluptuous-serialize==2.1.0",
] ]
MIN_PY_VERSION = '.'.join(map(str, hass_const.REQUIRED_PYTHON_VER)) MIN_PY_VERSION = ".".join(map(str, hass_const.REQUIRED_PYTHON_VER))
setup( setup(
name=PROJECT_PACKAGE_NAME, name=PROJECT_PACKAGE_NAME,
@ -67,11 +66,7 @@ setup(
include_package_data=True, include_package_data=True,
zip_safe=False, zip_safe=False,
install_requires=REQUIRES, install_requires=REQUIRES,
python_requires='>={}'.format(MIN_PY_VERSION), python_requires=">={}".format(MIN_PY_VERSION),
test_suite='tests', test_suite="tests",
entry_points={ entry_points={"console_scripts": ["hass = homeassistant.__main__:main"]},
'console_scripts': [
'hass = homeassistant.__main__:main'
]
},
) )