From 4403fe941dc3186cd4a01e3b768170b2c14051b4 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@paulusschoutsen.nl>
Date: Sun, 27 Dec 2015 16:15:39 -0800
Subject: [PATCH] Test config clean up

---
 .gitignore              | 1 +
 pytest.ini => setup.cfg | 3 +++
 setup.py                | 5 +++--
 3 files changed, 7 insertions(+), 2 deletions(-)
 rename pytest.ini => setup.cfg (54%)

diff --git a/.gitignore b/.gitignore
index 8935ffedc17..3ee71808ab1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,6 +41,7 @@ Icon
 dist
 build
 eggs
+.eggs
 parts
 bin
 var
diff --git a/pytest.ini b/setup.cfg
similarity index 54%
rename from pytest.ini
rename to setup.cfg
index 5ee64771657..35d8212de78 100644
--- a/pytest.ini
+++ b/setup.cfg
@@ -1,2 +1,5 @@
+[wheel]
+universal = 1
+
 [pytest]
 testpaths = tests
diff --git a/setup.py b/setup.py
index 5bdc07700d9..9cc79615c71 100755
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ REQUIRES = [
     'pytz>=2015.4',
     'pip>=7.0.0',
     'vincenty==0.1.3',
-    'jinja2>=2.8'
+    'jinja2>=2.8',
 ]
 
 setup(
@@ -33,6 +33,7 @@ setup(
     zip_safe=False,
     platforms='any',
     install_requires=REQUIRES,
+    test_suite='tests',
     keywords=['home', 'automation'],
     entry_points={
         'console_scripts': [
@@ -46,5 +47,5 @@ setup(
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 3.4',
         'Topic :: Home Automation'
-    ]
+    ],
 )