X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=setup.py;h=6d309f7eb57ffaf82a5d637de8baec61b92732b1;hb=1e9edcfaa5de951abf28936d225763c7ac925f6d;hp=cf3c2018ed8327d32597e1c41ffbc2b416c0413f;hpb=74ae6fb0b620c2f899e2c97ba5f6af105103df6f;p=mediagoblin.git

diff --git a/setup.py b/setup.py
index cf3c2018..6d309f7e 100644
--- a/setup.py
+++ b/setup.py
@@ -14,17 +14,25 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from __future__ import print_function
+
 from setuptools import setup, find_packages
+from io import open
 import os
 import re
 
+import sys
+
+PY2 = sys.version_info[0] == 2  # six is not installed yet
+
 READMEFILE = "README"
 VERSIONFILE = os.path.join("mediagoblin", "_version.py")
 VSRE = r"^__version__ = ['\"]([^'\"]*)['\"]"
 
 
 def get_version():
-    verstrline = open(VERSIONFILE, "rt").read()
+    with open(VERSIONFILE, "rt") as fobj:
+        verstrline = fobj.read()
     mo = re.search(VSRE, verstrline, re.M)
     if mo:
         return mo.group(1)
@@ -32,55 +40,79 @@ def get_version():
         raise RuntimeError("Unable to find version string in %s." %
                            VERSIONFILE)
 
+pyversion_install_requires = []
+if PY2:
+    pyversion_install_requires.append('sqlalchemy-migrate>=0.9.6')
+    pyversion_install_requires.append('mock==1.0.1')  # mock is in the stdlib for 3.3+
+    # PyPI version (1.4.2) does not have proper Python 3 support
+    pyversion_install_requires.append('ExifRead')
+
+install_requires = [
+    'waitress',
+    'alembic>=0.7.5',
+    'python-dateutil',
+    'wtforms',
+    'py-bcrypt',
+    'pytest>=2.3.1',
+    'pytest-xdist',
+    'werkzeug>=0.7',
+    'celery>=3.0,<4.0a0',
+    'kombu<4.0a0',
+    'jinja2',
+    'Babel>=1.3',
+    'WebTest>=2.0.18',
+    'ConfigObj',
+    'Markdown',
+    'sqlalchemy',
+    'itsdangerous',
+    'pytz',
+    'sphinx',
+    'six',
+    'oauthlib',
+    'unidecode',
+    'jsonschema',
+    'PasteDeploy',
+    'PasteScript',
+    'requests>=2.6.0',
+    'pyld',
+    # This is optional:
+    # 'translitcodec',
+    # For now we're expecting that users will install this from
+    # their package managers.
+    # 'lxml',
+    # 'Pillow',
+] + pyversion_install_requires
+
+dependency_links = []
+if not PY2:
+    # PyPI version (1.4.2) does not have proper Python 3 support
+    dependency_links.append('https://github.com/ianare/exif-py/zipball/develop#egg=ExifRead-2.0.0')
+    install_requires.append('ExifRead>=2.0.0')
 
-setup(
+with open(READMEFILE, encoding="utf-8") as fobj:
+    long_description = fobj.read()
+
+try:
+    setup(
     name="mediagoblin",
     version=get_version(),
     packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
     zip_safe=False,
     include_package_data = True,
     # scripts and dependencies
-    install_requires=[
-        'setuptools',
-        'PasteScript',
-        'wtforms',
-        'py-bcrypt',
-        'pytest>=2.3.1',
-        'pytest-xdist',
-        'werkzeug>=0.7',
-        'celery>=3.0',
-        'kombu',
-        'jinja2',
-        'sphinx',
-        'Babel<1.0',
-        'argparse',
-        'webtest<2',
-        'ConfigObj',
-        'Markdown',
-        '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',
-        # 'PIL',
-        ],
-    # requires=['gst'],
+    install_requires=install_requires,
+    dependency_links=dependency_links,
     test_suite='nose.collector',
     entry_points="""\
         [console_scripts]
         gmg = mediagoblin.gmg_commands:main_cli
-        pybabel = mediagoblin.babel.messages.frontend:main
 
         [paste.app_factory]
         app = mediagoblin.app:paste_app_factory
 
+        [paste.server_runner]
+        paste_server_selector = mediagoblin.app:paste_server_selector
+
         [paste.filter_app_factory]
         errors = mediagoblin.errormiddleware:mgoblin_error_middleware
 
@@ -94,16 +126,33 @@ setup(
     author='Free Software Foundation and contributors',
     author_email='cwebber@gnu.org',
     url="http://mediagoblin.org/",
-    download_url="http://mediagoblin.org/download/",
-    long_description=open(READMEFILE).read(),
+    long_description=long_description,
+    description='MediaGoblin is a web application for publishing all kinds of media',
     classifiers=[
         "Development Status :: 3 - Alpha",
         "Environment :: Web Environment",
         "License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
-        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
         "Topic :: Internet :: WWW/HTTP :: Dynamic Content"
         ],
     )
+except TypeError as e:
+    import sys
+
+    # Check if the problem is caused by the sqlalchemy/setuptools conflict
+    msg_as_str = str(e)
+    if not (msg_as_str == 'dist must be a Distribution instance'):
+        raise
+
+    # If so, tell the user it is OK to just run the script again.
+    print("\n\n---------- NOTE ----------", file=sys.stderr)
+    print("The setup.py command you ran failed.\n", file=sys.stderr)
+    print("It is a known possible failure. Just run it again. It works the "
+          "second time.", file=sys.stderr)
+    sys.exit(1)