projects
/
mediagoblin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/master' into change_email
[mediagoblin.git]
/
setup.py
diff --git
a/setup.py
b/setup.py
index e0f7af7ea02f5c06fe5bc1520fd6de5cdc4e17a8..4ceac45b37fd9db9c07744bd8219b70f96021fc0 100644
(file)
--- a/
setup.py
+++ b/
setup.py
@@
-14,7
+14,7
@@
# 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/>.
# 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 setuptools import setup
, find_packages
+from setuptools import setup
import os
import re
import os
import re
@@
-36,31
+36,35
@@
def get_version():
setup(
name="mediagoblin",
version=get_version(),
setup(
name="mediagoblin",
version=get_version(),
- packages=
find_packages(exclude=['ez_setup', 'examples', 'tests'])
,
+ packages=
['mediagoblin']
,
zip_safe=False,
include_package_data = True,
# scripts and dependencies
install_requires=[
'setuptools',
'PasteScript',
zip_safe=False,
include_package_data = True,
# scripts and dependencies
install_requires=[
'setuptools',
'PasteScript',
- 'beaker',
- 'webob<=1.2a2,>=1.1',
'wtforms',
'py-bcrypt',
'wtforms',
'py-bcrypt',
- 'nose',
+ 'pytest',
+ 'pytest-xdist',
'werkzeug>=0.7',
'celery==2.5.3',
'kombu==2.1.7',
'jinja2',
'sphinx',
'Babel',
'werkzeug>=0.7',
'celery==2.5.3',
'kombu==2.1.7',
'jinja2',
'sphinx',
'Babel',
- 'translitcodec',
'argparse',
'argparse',
- 'webtest',
+ 'webtest
<2
',
'ConfigObj',
'Markdown',
'sqlalchemy>=0.7.0',
'sqlalchemy-migrate',
'ConfigObj',
'Markdown',
'sqlalchemy>=0.7.0',
'sqlalchemy-migrate',
+ 'mock',
+ 'itsdangerous',
+ 'pytz',
+ 'six',
+ ## 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',
@@
-94,7
+98,7
@@
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",
'Programming Language :: Python :: 2.6',
"Operating System :: OS Independent",
"Programming Language :: Python",
'Programming Language :: Python :: 2.6',