Merge commit 'dsc/master'

Author: Matt George

.gitignore

@@ -1,3 +1,4 @@
 *.pyc
 build/
-.coverage
+.coverage
+*.egg-info

README.markdown

@@ -1,13 +1,23 @@
 PyRes - a Resque clone
 ======================
+
 [Resque](http://github.com/defunkt/resque) is a great implementation of a job queue by the people at github. It's written in ruby, which is great, but I primarily work in python. So I took on the task of porting over the code to python and PyRes was the result
 
-Goals
------
+
+## Project Goals
+
 Because of some differences between ruby and python, there are a couple of places where I chose speed over correctness. The goal will be to eventually take the application and make it more pythonic without sacrificing the awesome functionality found in resque. At the same time, I hope to stay within the bounds of the original api and web interface.
 
-TODO
-----
+
+## Running Tests
+
+ 1. Install nose: `$ easy_install nose`
+ 2. Start redis: `$ redis-server [PATH_TO_YOUR_REDIS_CONFIG]`
+ 3. Run nose: `$ nosetests` Or more verbosely: `$ nosetests -v`
+
+
+## TODO
+
 Stabalize the api.
 
 Flesh out a python version of the web interface. Currently, there is a resweb module that uses the itty micro framework and the jinja2 templating engine to display basics. I'd like to get this as close to the resque web interface as possible.

setup.py

@@ -1,12 +1,20 @@
 from distutils.core import setup
 
-setup(name='PyRes',
-      version='0.3.0',
-      description='Python Resque Job',
-      author='Matt George',
-      author_email='[email protected]',
-      url='http://github.com/binarydud/pyres',
-      packages=['pyres', 'resweb'],
-      package_data={'resweb': ['templates/*.mustache','media/*']},
-      scripts=['scripts/pyres_worker', 'scripts/pyres_web']
+setup(
+    name='PyRes',
+    version='0.3.0',
+    description='Python Resque Job',
+    author='Matt George',
+    author_email='[email protected]',
+    url='http://github.com/binarydud/pyres',
+    packages=['pyres', 'resweb'],
+    package_data={'resweb': ['templates/*.mustache','media/*']},
+    scripts=['scripts/pyres_worker', 'scripts/pyres_web'],
+    zip_safe = True,
+    install_requires=[
+        'simplejson>=2.0.9',
+        'itty>=0.6.2',
+        'redis>=0.6.0',
+        'pystache>=0.1.0'
+    ],
 )