From 3c859423b37241c5cd81097243f1303bb946a394 Mon Sep 17 00:00:00 2001
From: pictuga <contact@pictuga.com>
Date: Sat, 21 Jun 2014 16:38:48 +0200
Subject: [PATCH] Add requirements, edit setup.py and README

---
 README.md        |  3 +++
 requirements.txt |  6 ++++++
 setup.py         | 20 +++++++-------------
 3 files changed, 16 insertions(+), 13 deletions(-)
 create mode 100644 requirements.txt

diff --git a/README.md b/README.md
index 9923790..e48f46a 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,9 @@ You do need:
 - [html2text](http://www.aaronsw.com/2002/html2text/)
 - [OrderedDict](https://pypi.python.org/pypi/ordereddict) if using python < 2.7
 
+Simplest way to get these:
+  `pip install -r requirements.txt`
+
 You may also need:
 - Apache, with python-cgi support, to run on a server
 - a fast internet connection
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..ea7d669
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,6 @@
+lxml
+git+https://github.com/buriy/python-readability#egg=readability-lxml
+python-dateutil <= 1.5
+html2text
+ordereddict
+wheezy.template
diff --git a/setup.py b/setup.py
index 55e3168..ef764d3 100644
--- a/setup.py
+++ b/setup.py
@@ -1,19 +1,13 @@
-from distutils.core import setup
+from setuptools import setup, find_packages
 
-setup(	name='morss',
+package_name = 'morss'
+setup(	name=package_name,
 	description='Get full-text RSS feeds',
 	author='pictuga',
 	author_email='contact at author name dot com',
 	url='http://morss.it/',
 	license='GPL 3+',
-	packages=['morss'],
-	package_data={'':['feedify.ini']},
-	install_requires=[
-		'readability-lxml',
-		'python-dateutil <= 1.5',
-		'lxml',
-		'html2text',
-		'ordereddict',
-		'wheezy.template'
-	]
-	)
+	package_dir={package_name: package_name},
+	packages=find_packages(),
+	package_data={package_name: ['feedify.ini']},
+	test_suite=package_name + '.tests')