diff --git a/dev_requirements.txt b/dev_requirements.txt --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -1,10 +1,10 @@ -babel >= 0.9.6, < 2.4 +Babel >= 0.9.6, < 2.4 waitress >= 0.8.8, < 1.0 -pytest ~= 3.0, >= 3.3.0 +pytest >= 3.3.0, < 4 pytest-runner -pytest-sugar>=0.7.0 +pytest-sugar >= 0.7.0 pytest-benchmark pytest-localserver mock -sphinx -webtest < 3 +Sphinx +WebTest < 3 diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -35,39 +35,39 @@ callback = lambda V: ('.'.join(map(str, is_windows = __platform__ in ['Windows'] requirements = [ - "alembic>=0.8.0,<0.9", - "GearBox<1", - "waitress>=0.8.8,<1.0", - "webob>=1.7,<1.8.0", # TurboGears2 doesn't support 1.8.0 + "alembic >= 0.8.0, < 0.9", + "gearbox < 1", + "waitress >= 0.8.8, < 1.0", + "WebOb >= 1.7, < 1.8.0", # TurboGears2 doesn't support 1.8.0 "backlash >= 0.1.2, < 1.0.0", "TurboGears2 >= 2.3.10, < 3.0.0", "tgext.routes >= 0.2.0, < 1.0.0", - "Beaker>=1.7.0,<2", - "WebHelpers==1.3", - "formencode>=1.2.4,<=1.2.6", - "SQLAlchemy>=1.1,<1.2", - "Mako>=0.9.0,<=1.0.0", - "pygments>=1.5", - "whoosh>=2.5.0,<=2.5.7", - "celery>=3.1,<3.2", - "babel>=0.9.6,<2.4", - "python-dateutil>=1.5.0,<2.0.0", - "markdown==2.2.1", - "docutils>=0.8.1", - "URLObject==2.3.4", - "Routes==1.13", - "dulwich>=0.14.1", - "mercurial>=4.1.1,<4.8", + "Beaker >= 1.7.0, < 2", + "WebHelpers == 1.3", + "FormEncode >= 1.2.4, <= 1.2.6", + "SQLAlchemy >= 1.1, < 1.2", + "Mako >= 0.9.0, <= 1.0.0", + "Pygments >= 1.5", + "Whoosh >= 2.5.0, <= 2.5.7", + "celery >= 3.1, < 3.2", + "Babel >= 0.9.6, < 2.4", + "python-dateutil >= 1.5.0, < 2.0.0", + "Markdown == 2.2.1", + "docutils >= 0.8.1", + "URLObject == 2.3.4", + "Routes == 1.13", + "dulwich >= 0.14.1", + "mercurial >= 4.1.1, < 4.8", "decorator >= 3.3.2", "Paste >= 2.0.3, < 3.0", ] if sys.version_info < (2, 7): - requirements.append("importlib==1.0.1") + requirements.append("importlib == 1.0.1") requirements.append("argparse") if not is_windows: - requirements.append("bcrypt>=3.1.0") + requirements.append("bcrypt >= 3.1.0") dependency_links = [ ]