Merge branch 'release/1.1'

Matt George · Matt George · commit 12eb028dddd8 · 2011-06-16T08:25:00.000-05:00
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -6,5 +6,6 @@
 * Alex Ezell
 * Michael Russo
 * Whit Morris
+* Joe Shaw
 
-Inspired by Resque, by Chris Wanstrath
+Inspired by Resque, by Chris Wanstrath
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,3 +1,8 @@
+##1.1 (2011-06-16)
+* api change based on redis-py
+* setproctitle requirements fix
+* change exception logging in worker
+
 ##1.0.1 (2011-04-12)
 * fixed bug with tempaltes and media in resweb
 * call to redis-py disconnect was failing, switched to connection.disconnect
diff --git a/pyres/__init__.py b/pyres/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '1.0.1'
+__version__ = '1.1'
 
 from redis import Redis
 import pyres.json_parser as json
diff --git a/setup.py b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version='1.0.1'
+version='1.1'
 
 setup(
     name='pyres',
@@ -27,7 +27,7 @@
         'itty>=0.6.2',
         'redis>=1.34.1',
         'pystache>=0.1.0',
-        'setproctitle==1.0'
+        'setproctitle>=1.0'
     ],
     classifiers = [
             'Development Status :: 4 - Beta',

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-__version__ = '1.0.1'`
	`1`	`+__version__ = '1.1'`
`2`	`2`
`3`	`3`	`from redis import Redis`
`4`	`4`	`import pyres.json_parser as json`