update 1.5.2

sources/Makefile

@@ -32,7 +32,7 @@ test: | $(TOOLS)
 	# $(ENV)/bin/nosetests -s tokenserver.tests
 	
 	# Test against a running server
-	$(ENV)/bin/pserve syncserver/tests.ini 2> /dev/null & SERVER_PID=$$!; \
+	$(ENV)/bin/gunicorn --paste syncserver/tests.ini 2> /dev/null & SERVER_PID=$$!; \
 	sleep 2; \
 	$(ENV)/bin/python -m syncstorage.tests.functional.test_storage \
 		--use-token-server http://localhost:5000/token/1.0/sync/1.5; \
@@ -43,7 +43,7 @@ $(TOOLS): | $(ENV)/COMPLETE
 
 .PHONY: serve
 serve: | $(ENV)/COMPLETE
-	$(ENV)/bin/pserve ./syncserver.ini
+	$(ENV)/bin/gunicorn --paste ./syncserver.ini
 
 .PHONY: clean
 clean:

sources/requirements.txt

@@ -1,7 +1,7 @@
 cornice==0.16.2
 gunicorn==19.1.1
 pyramid==1.5
-requests==2.2.1
+requests==2.7
 simplejson==3.4
 SQLAlchemy==0.9.4
 unittest2==0.5.1

sources/setup.py

@@ -10,7 +10,7 @@ main = syncserver:main
 
 setup(
     name='syncserver',
-    version="1.5.1",
+    version="1.5.2",
     packages=['syncserver'],
     entry_points=entry_points
 )

sources/syncserver.ini

@@ -1,7 +1,9 @@
 [server:main]
-use = egg:Paste#http
+use = egg:gunicorn
 host = 0.0.0.0
 port = 5000
+workers = 1
+timeout = 30
 
 [app:main]
 use = egg:syncserver

sources/syncserver/tests.ini

@@ -1,7 +1,9 @@
 [server:main]
-use = egg:Paste#http
+use = egg:gunicorn
 host = 0.0.0.0
 port = 5000
+workers = 1
+timeout = 30
 
 [app:main]
 use = egg:SyncServer