diff options
| author | Brandon Invergo <brandon@invergo.net> | 2013-05-19 13:23:17 +0200 |
|---|---|---|
| committer | Brandon Invergo <brandon@invergo.net> | 2013-05-19 13:23:17 +0200 |
| commit | e02b7b6b3bd6b20c65aeb2ca5fd1e0030b631b88 (patch) | |
| tree | 988b9505a649f824f2ea53ac04bdfbc3a0da983a /setup.py | |
| parent | 60c42337ef7bc9b4aec0d3f1b2cb5f19a09d9a7f (diff) | |
| parent | 041d2fd785f9b3e18f9fd758f91dbfa7715d317c (diff) | |
| download | mediagoblin-e02b7b6b3bd6b20c65aeb2ca5fd1e0030b631b88.tar.lz mediagoblin-e02b7b6b3bd6b20c65aeb2ca5fd1e0030b631b88.tar.xz mediagoblin-e02b7b6b3bd6b20c65aeb2ca5fd1e0030b631b88.zip | |
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
Diffstat (limited to 'setup.py')
| -rw-r--r-- | setup.py | 18 |
1 files changed, 11 insertions, 7 deletions
@@ -43,24 +43,28 @@ setup( install_requires=[ 'setuptools', 'PasteScript', - 'beaker', - 'webob<=1.2a2,>=1.1', 'wtforms', 'py-bcrypt', - 'nose', - 'werkzeug', + 'pytest', + 'pytest-xdist', + 'werkzeug>=0.7', 'celery==2.5.3', 'kombu==2.1.7', 'jinja2', 'sphinx', 'Babel', - 'translitcodec', 'argparse', - 'webtest', + 'webtest<2', 'ConfigObj', 'Markdown', 'sqlalchemy>=0.7.0', 'sqlalchemy-migrate', + 'mock', + 'itsdangerous', + 'pytz', + 'six', + ## This is optional! + # 'translitcodec', ## For now we're expecting that users will install this from ## their package managers. # 'lxml', @@ -94,7 +98,7 @@ setup( classifiers=[ "Development Status :: 3 - Alpha", "Environment :: Web Environment", - "License :: OSI Approved :: GNU Affero General Public License", + "License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)", "Operating System :: OS Independent", "Programming Language :: Python", 'Programming Language :: Python :: 2.6', |