Merge remote-tracking branch 'upstream/master' into change_email

[mediagoblin.git] / setup.py

diff --git a/setup.py b/setup.py
index ce1e41029e83871bf20c06f882e0c99c71de3628..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/>.
 
-from setuptools import setup, find_packages
+from setuptools import setup
 import os
 import re
 
@@ -36,7 +36,7 @@ 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
@@ -62,6 +62,7 @@ setup(
         'mock',
         'itsdangerous',
         'pytz',
+        'six',
         ## This is optional!
         # 'translitcodec',
         ## For now we're expecting that users will install this from