Update requirements

requirements.txt

@@ -4,12 +4,12 @@
 #
 #     pip install -r requirements.txt
 
-Baker>=1.3
+#pypy: hg+ssh://hg@bitbucket.org/lucuma/cherrypy/#egg=cherrypy
 CherryPy>=3.2.4
+Baker>=1.3
 Flask>=0.10.1
 Jinja2>=2.7.1
 Pygments>=1.6
 Voodoo>=1.3.1
 Werkzeug>=0.9.3
-Markdown>=2.3.1
-DynPool>=1.0.2.
+Markdown>=2.3.1

setup.py

@@ -27,7 +27,8 @@ def get_description():
 def get_requirements(filename='requirements.txt'):
     data = read_from(get_path(filename))
     lines = map(lambda s: s.strip(), data.splitlines())
-    return [l for l in lines if l and not l.startswith('#')]
+    requirements = [l for l in lines if l and not l.startswith('#')]
+    return requirements
 
 
 setup(

tox.ini

@@ -4,7 +4,7 @@ envlist = py27, pypy
 [testenv]
 setenv =
     PYTHONPATH = {toxinidir}:{toxinidir}/solution
-commands = py.test tests
+commands = pip install -U hg+ssh://hg@bitbucket.org/lucuma/cherrypy/#egg=cherrypy && py.test tests
 deps =
     pytest
     -r{toxinidir}/requirements.txt