From 67ebac03ed5e61c263ef6182bbc84c46e3aea2f6 Mon Sep 17 00:00:00 2001
From: Jason Robinson <mail@jasonrobinson.me>
Date: Wed, 8 Jul 2015 11:57:33 +0300
Subject: [PATCH] Wait, why are social-relay deps here? Late night commits....
 Fix setup.py, remove unnecessary requirements.txt files too

---
 requirements.txt      |  4 ----
 setup.py              | 21 ++++++++-------------
 test-requirements.txt |  1 -
 3 files changed, 8 insertions(+), 18 deletions(-)
 delete mode 100644 requirements.txt
 delete mode 100644 test-requirements.txt

diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index 52b2da3..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-dirty-validators==0.3.2
-lxml==3.4.4
-pycrypto==2.6.1
-python-dateutil==2.4.2
diff --git a/setup.py b/setup.py
index ffe737e..5146e37 100644
--- a/setup.py
+++ b/setup.py
@@ -1,16 +1,7 @@
 #!/usr/bin/env python
-from pip.req import parse_requirements
 from setuptools import setup, find_packages
 
 
-# parse_requirements() returns generator of pip.req.InstallRequirement objects
-install_reqs = parse_requirements("requirements.txt")
-
-# reqs is a list of requirement
-# e.g. ['django==1.5.1', 'mezzanine==1.4.6']
-reqs = [str(ir.req) for ir in install_reqs]
-
-
 setup(
     name='Social-Federation',
     version='0.1.0',
@@ -21,8 +12,12 @@ setup(
     packages=find_packages(exclude=["*.tests.*", "*.tests"]),
     license="BSD 3-clause",
     install_requires=[
-        "Flask==0.10.1",
-        "hiredis==0.2.0",
-        "redis==2.10.3",
-    ] + reqs,
+        "dirty-validators==0.3.2",
+        "lxml==3.4.4",
+        "pycrypto==2.6.1",
+        "python-dateutil==2.4.2",
+    ],
+    test_require=[
+        "pytest==2.7.2",
+    ],
 )
diff --git a/test-requirements.txt b/test-requirements.txt
deleted file mode 100644
index f1e2df4..0000000
--- a/test-requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
-pytest==2.7.2