This update I mostly did work on the templates for the admin pages. I did a co-

[mediagoblin.git] / setup.py

diff --git a/setup.py b/setup.py
index 9c295dc4972ab31818de6554560af735213bed40..f320e92cb774262dec31910b429df58b4d59e528 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/>.
 
-from setuptools import setup, find_packages
+from setuptools import setup
 import os
 import re
 
@@ -36,17 +36,17 @@ def 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',
-        'beaker',
         'wtforms',
         'py-bcrypt',
-        'nose',
+        'pytest>=2.3',
+        'pytest-xdist',
         'werkzeug>=0.7',
         'celery==2.5.3',
         'kombu==2.1.7',
@@ -54,12 +54,15 @@ setup(
         'sphinx',
         'Babel',
         'argparse',
-        'webtest',
+        'webtest<2',
         '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