projects
/
mediagoblin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 293f3f03d5615bdf28976fb6c73fa6ce7ee1c65e..cf3c2018ed8327d32597e1c41ffbc2b416c0413f 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 MediaGoblin contributors. See AUTHORS.
+# 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
@@
-38,32
+38,38
@@
setup(
version=get_version(),
packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
zip_safe=False,
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',
# scripts and dependencies
install_requires=[
'setuptools',
'PasteScript',
- 'beaker',
- 'routes',
- 'pymongo',
- 'mongokit',
- 'webob<=1.2a2',
'wtforms',
'py-bcrypt',
'wtforms',
'py-bcrypt',
- 'nose',
- 'werkzeug',
- 'celery',
+ 'pytest>=2.3.1',
+ 'pytest-xdist',
+ 'werkzeug>=0.7',
+ 'celery>=3.0',
+ 'kombu',
'jinja2',
'sphinx',
'jinja2',
'sphinx',
- 'PIL',
- 'Babel',
- 'translitcodec',
+ 'Babel<1.0',
'argparse',
'argparse',
- 'webtest',
+ 'webtest
<2
',
'ConfigObj',
'Markdown',
'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',
## For now we're expecting that users will install this from
## their package managers.
# 'lxml',
+ # 'PIL',
],
# requires=['gst'],
test_suite='nose.collector',
],
# requires=['gst'],
test_suite='nose.collector',
@@
-93,9
+99,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"
],
)