projects
/
mediagoblin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix errors in collection views
[mediagoblin.git]
/
setup.py
diff --git
a/setup.py
b/setup.py
index c09e535b5a62bbb36f5fd431b7e042e6c805f1e6..9c295dc4972ab31818de6554560af735213bed40 100644
(file)
--- a/
setup.py
+++ b/
setup.py
@@
-1,5
+1,5
@@
# GNU MediaGoblin -- federated, autonomous media hosting
# GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011
Free Software Foundation, Inc
+# Copyright (C) 2011
, 2012 MediaGoblin contributors. See AUTHORS.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@
-29,44
+29,47
@@
def get_version():
if mo:
return mo.group(1)
else:
if mo:
return mo.group(1)
else:
- raise RuntimeError("Unable to find version string in %s." % VERSIONFILE)
+ raise RuntimeError("Unable to find version string in %s." %
+ VERSIONFILE)
setup(
setup(
- name
=
"mediagoblin",
- version
=
get_version(),
+ name
=
"mediagoblin",
+ version
=
get_version(),
packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
zip_safe=False,
packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
zip_safe=False,
+ include_package_data = True,
# scripts and dependencies
# scripts and dependencies
- install_requires
=
[
+ install_requires
=
[
'setuptools',
'PasteScript',
'beaker',
'setuptools',
'PasteScript',
'beaker',
- 'routes',
- 'pymongo',
- 'mongokit',
- 'webob',
'wtforms',
'py-bcrypt',
'nose',
'wtforms',
'py-bcrypt',
'nose',
- 'werkzeug',
- 'celery',
+ 'werkzeug>=0.7',
+ 'celery==2.5.3',
+ 'kombu==2.1.7',
'jinja2',
'sphinx',
'jinja2',
'sphinx',
- 'PIL',
'Babel',
'Babel',
- 'translitcodec',
'argparse',
'webtest',
'ConfigObj',
'Markdown',
'argparse',
'webtest',
'ConfigObj',
'Markdown',
- 'python-cloudfiles',
+ 'sqlalchemy>=0.7.0',
+ 'sqlalchemy-migrate',
+ 'mock',
+ ## This is optional!
+ # 'translitcodec',
## For now we're expecting that users will install this from
## their package managers.
# 'lxml',
## For now we're expecting that users will install this from
## their package managers.
# 'lxml',
+ # 'PIL',
],
],
+ # requires=['gst'],
test_suite='nose.collector',
test_suite='nose.collector',
- entry_points
=
"""\
+ entry_points
=
"""\
[console_scripts]
gmg = mediagoblin.gmg_commands:main_cli
pybabel = mediagoblin.babel.messages.frontend:main
[console_scripts]
gmg = mediagoblin.gmg_commands:main_cli
pybabel = mediagoblin.babel.messages.frontend:main
@@
-83,7
+86,6
@@
setup(
[babel.extractors]
jinja2 = jinja2.ext:babel_extract
""",
[babel.extractors]
jinja2 = jinja2.ext:babel_extract
""",
-
license='AGPLv3',
author='Free Software Foundation and contributors',
author_email='cwebber@gnu.org',
license='AGPLv3',
author='Free Software Foundation and contributors',
author_email='cwebber@gnu.org',
@@
-93,9
+95,11
@@
setup(
classifiers=[
"Development Status :: 3 - Alpha",
"Environment :: Web Environment",
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",
"Operating System :: OS Independent",
"Programming Language :: Python",
+ 'Programming Language :: Python :: 2.6',
+ 'Programming Language :: Python :: 2.7',
"Topic :: Internet :: WWW/HTTP :: Dynamic Content"
],
)
"Topic :: Internet :: WWW/HTTP :: Dynamic Content"
],
)