From 4c258ce08b6e53c491f948332397c128e0e83787 Mon Sep 17 00:00:00 2001
From: cdce8p <30130371+cdce8p@users.noreply.github.com>
Date: Sun, 1 Jul 2018 17:48:54 +0200
Subject: [PATCH] Revert some changes to setup.py (#15248)

---
 setup.cfg | 14 --------------
 setup.py  | 12 +++++++++++-
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 2abd445bb85..7813cc5c047 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,20 +15,6 @@ classifier =
     Programming Language :: Python :: 3.6
     Topic :: Home Automation
 
-[options]
-packages = find:
-include_package_data = true
-zip_safe = false
-
-[options.entry_points]
-console_scripts =
-    hass = homeassistant.__main__:main
-
-[options.packages.find]
-exclude =
-    tests
-    tests.*
-
 [tool:pytest]
 testpaths = tests
 norecursedirs = .git testing_config
diff --git a/setup.py b/setup.py
index 3833f90f2d1..928d894c9d1 100755
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 """Home Assistant setup script."""
 from datetime import datetime as dt
-from setuptools import setup
+from setuptools import setup, find_packages
 
 import homeassistant.const as hass_const
 
@@ -29,6 +29,8 @@ PROJECT_URLS = {
     'Forum': 'https://community.home-assistant.io/',
 }
 
+PACKAGES = find_packages(exclude=['tests', 'tests.*'])
+
 REQUIRES = [
     'aiohttp==3.3.2',
     'astral==1.6.1',
@@ -53,7 +55,15 @@ setup(
     project_urls=PROJECT_URLS,
     author=PROJECT_AUTHOR,
     author_email=PROJECT_EMAIL,
+    packages=PACKAGES,
+    include_package_data=True,
+    zip_safe=False,
     install_requires=REQUIRES,
     python_requires='>={}'.format(MIN_PY_VERSION),
     test_suite='tests',
+    entry_points={
+        'console_scripts': [
+            'hass = homeassistant.__main__:main'
+        ]
+    },
 )