Merge branch 'merge-python3-port'

[mediagoblin.git] / setup.py

diff --git a/setup.py b/setup.py
index 658cf8c32d700afc3ffdc82c54777b46b9e41f3e..a644a3c3f57ec0129832fc4c17cbd6b3bf1dcfe7 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -17,6 +17,7 @@
 from __future__ import print_function
 
 from setuptools import setup, find_packages
+from io import open
 import os
 import re
 
@@ -47,10 +48,15 @@ if PY2:
     # TERRIBLE AND IS THE END OF ALL THINGS
     # I'd love to remove this restriction.
     py2_only_install_requires.append('sqlalchemy-migrate<0.8')
+    # # Annoying.  Please remove once we can!  We only indirectly
+    # # use pbr, and currently it breaks things, presumably till
+    # # their next release.
+    # py2_only_install_requires.append('pbr==0.5.22')
     py2_only_install_requires.append('mock')  # mock is in the stdlib for 3.3+
 
 install_requires = [
-    'setuptools',  # TODO: is this necessary
+    'gunicorn',
+    'alembic==0.6.6',
     'python-dateutil',
     'wtforms',
     'py-bcrypt',
@@ -60,8 +66,7 @@ install_requires = [
     'celery>=3.0',
     'kombu',
     'jinja2',
-    'sphinx',  # TODO: is this a docs requirement?
-    'Babel<1.0',  # TODO: why <1.0 or 0.9.6?
+    'Babel>=1.3',
     'webtest<2',
     'ConfigObj',
     'Markdown',
@@ -71,23 +76,22 @@ install_requires = [
     # PLEASE change this when we can; a dependency is forcing us to set this
     # specific number and it is breaking setup.py develop
     'six==1.5.2',
-    'oauthlib==0.5.0',
+    'oauthlib',
     'unidecode',
-    'ExifRead',
-    # Annoying.  Please remove once we can!  We only indirectly
-    # use pbr, and currently it breaks things, presumably till
-    # their next release.
-    'pbr==0.5.22',
+    'jsonschema',
+    'ExifRead',  # TODO(berker): Install develop branch for Python 3
     'PasteDeploy',
+    'requests',
+    'pyld',
     # This is optional:
     # 'translitcodec',
     # For now we're expecting that users will install this from
     # their package managers.
     # 'lxml',
-    # 'PIL',  # TODO: switch to Pillow?
+    # 'Pillow',
 ] + py2_only_install_requires
 
-with open(READMEFILE) as fobj:
+with open(READMEFILE, encoding="utf-8") as fobj:
     long_description = fobj.read()
 
 try:
@@ -99,7 +103,7 @@ try:
     include_package_data = True,
     # scripts and dependencies
     install_requires=install_requires,
-    test_suite='nose.collector',  # TODO: We are using py.test now?
+    test_suite='nose.collector',
     entry_points="""\
         [console_scripts]
         gmg = mediagoblin.gmg_commands:main_cli
@@ -121,8 +125,8 @@ try:
     author='Free Software Foundation and contributors',
     author_email='cwebber@gnu.org',
     url="http://mediagoblin.org/",
-    download_url="http://mediagoblin.org/download/",
     long_description=long_description,
+    description='MediaGoblin is a web application for publishing all kinds of media',
     classifiers=[
         "Development Status :: 3 - Alpha",
         "Environment :: Web Environment",