From 891201731ac2508bce6b131ec9936d21b5ce245b Mon Sep 17 00:00:00 2001
From: Alexander Dutton <alexander.dutton@it.ox.ac.uk>
Date: Thu, 24 Jan 2013 11:23:26 +0000
Subject: [PATCH] Fixed setup.py.

---
 MANIFEST.in      |  1 +
 requirements.txt |  4 ++--
 setup.py         | 28 ++++++++++++++--------------
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 474fd05..c5c480f 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,4 @@
+include requirements.txt
 include README.rst
 include LICENSE
 include HISTORY.rst
diff --git a/requirements.txt b/requirements.txt
index f6e655c..a3d1fe7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,2 @@
-requests
-kerberos
+requests==1.1.0
+kerberos==1.1.1
diff --git a/setup.py b/setup.py
index 78c0dc5..9717ca0 100644
--- a/setup.py
+++ b/setup.py
@@ -3,10 +3,10 @@
 import os
 from setuptools import setup
 
-version_file = 'requests_kerberos/__init__.py'
-exec(compile(open(version_file).read(), version_file, 'exec'))
+import requests_kerberos
 
-requires = ['kerberos', 'requests']
+with open('requirements.txt') as requirements:
+    requires = [line.strip() for line in requirements if line.strip()]
 
 path = os.path.dirname(__file__)
 desc_fd = os.path.join(path, 'README.rst')
@@ -19,16 +19,16 @@ if os.path.isfile(desc_fd):
     long_desc = open(desc_fd).read()
 
 if os.path.isfile(hist_fd):
-    long_desc = '\n\n'.join(long_desc, open(hist_fd).read())
+    long_desc = '\n\n'.join([long_desc, open(hist_fd).read()])
 
 setup(
-      name='requests-kerberos',
-      description=short_desc,
-      long_description=long_desc,
-      url='https://github.com/requests/requests-kerberos',
-      packages=['requests_kerberos'],
-      package_data={'': ['LICENSE', 'AUTHORS']},
-      include_package_data=True,
-      version=__version__,  # NOQA
-      install_requires=requires,
-     )
+    name='requests-kerberos',
+    description=short_desc,
+    long_description=long_desc,
+    url='https://github.com/requests/requests-kerberos',
+    packages=['requests_kerberos'],
+    package_data={'': ['LICENSE', 'AUTHORS']},
+    include_package_data=True,
+    version=requests_kerberos.__version__,  # NOQA
+    install_requires=requires,
+)