From 5c073fdd8329fc3094f78d1730586e3e7ac16c81 Mon Sep 17 00:00:00 2001
From: Adam Tauber <asciimoo@gmail.com>
Date: Sat, 2 Jan 2016 12:36:36 +0100
Subject: [PATCH] [enh] setup.py requirements ++ new folders

---
 setup.py | 35 +++++++----------------------------
 1 file changed, 7 insertions(+), 28 deletions(-)

diff --git a/setup.py b/setup.py
index 6888ab2cf..fce32bb0c 100644
--- a/setup.py
+++ b/setup.py
@@ -17,6 +17,8 @@ def read(*rnames):
 
 
 long_description = read('README.rst')
+requirements = map(str.strip, open('requirements.txt').readlines())
+dev_requirements = map(str.strip, open('requirements-dev.txt').readlines())
 
 setup(
     name='searx',
@@ -38,35 +40,9 @@ setup(
     license='GNU Affero General Public License',
     packages=find_packages('.'),
     zip_safe=False,
-    install_requires=[
-        'flask',
-        'flask-babel',
-        'requests',
-        'lxml',
-        'pyyaml',
-        'pygments',
-        'setuptools',
-        'python-dateutil',
-        'pyopenssl',
-        'ndg-httpsclient',
-        'pyasn1',
-        'pyasn1-modules',
-        'certifi'
-    ],
+    install_requires=requirements,
     extras_require={
-        'test': [
-            'coverage',
-            'flake8',
-            'mock',
-            'plone.testing',
-            'robotframework',
-            'robotframework-debuglibrary',
-            'robotframework-httplibrary',
-            'robotframework-selenium2library',
-            'robotsuite',
-            'unittest2',
-            'zope.testrunner',
-        ]
+        'test': dev_requirements
     },
     entry_points={
         'console_scripts': [
@@ -86,6 +62,9 @@ setup(
             'static/*/*/*/*/*.*',
             'templates/*/*.*',
             'templates/*/*/*.*',
+            'tests/*',
+            'tests/*/*',
+            'tests/*/*/*',
             'translations/*/*/*'
         ],
     },