Updating the video.js that we use to avoid an XSS attack. Yikes! ;\

[mediagoblin.git] / setup.py

diff --git a/setup.py b/setup.py
index e0f7af7ea02f5c06fe5bc1520fd6de5cdc4e17a8..cf3c2018ed8327d32597e1c41ffbc2b416c0413f 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -43,24 +43,29 @@ setup(
     install_requires=[
         'setuptools',
         'PasteScript',
-        'beaker',
-        'webob<=1.2a2,>=1.1',
         'wtforms',
         'py-bcrypt',
-        'nose',
+        'pytest>=2.3.1',
+        'pytest-xdist',
         'werkzeug>=0.7',
-        'celery==2.5.3',
-        'kombu==2.1.7',
+        'celery>=3.0',
+        'kombu',
         'jinja2',
         'sphinx',
-        'Babel',
-        'translitcodec',
+        'Babel<1.0',
         'argparse',
-        'webtest',
+        'webtest<2',
         'ConfigObj',
         'Markdown',
-        'sqlalchemy>=0.7.0',
+        'sqlalchemy>=0.8.0',
         'sqlalchemy-migrate',
+        'mock',
+        'itsdangerous',
+        'pytz',
+        'six',
+        'oauthlib==0.5.0',
+        ## This is optional!
+        # 'translitcodec',
         ## For now we're expecting that users will install this from
         ## their package managers.
         # 'lxml',
@@ -94,7 +99,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',