updated versions

chiminey · Dec 5, 2014 · a4ccb3a · a4ccb3a
1 parent 0fe8bf2
commit a4ccb3a
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 2,732 deletions.
diff --git a/buildout.cfg b/buildout.cfg
@@ -18,7 +18,6 @@ eggs =
     django-inmemorystorage==0.1.1
     mock==1.0.1
     HTTPretty==0.8.0
-    moto==0.2.21
 
 
 versions = versions
@@ -32,7 +31,7 @@ psycopg2 = 2.5.2
 python-magic = 0.4.0dev
 Wand = 0.1.10
 django-tastypie = 0.9.15
-setuptools = 0.9.8
+#setuptools = 0.9.8
 
 [django]
 recipe = djangorecipe

diff --git a/setup.py b/setup.py
@@ -17,15 +17,16 @@
     packages=find_packages(),
     namespace_packages=['chiminey'],
     install_requires=[
-        'setuptools==0.9.8',
+        #'setuptools==0.9.8',
+        'setuptools',
         'django==1.4.5',
         'django-registration',
         'django-extensions',
         'django-form-utils',
         'django-haystack',
         'django-bootstrap-form',
-        'celery==3.1.10',
-        'django-celery==3.1.10',
+        'celery==3.1.16',
+        'django-celery==3.1.16',
         'django-kombu==0.9.4',
         'django-mptt',
         'django-storages',
@@ -34,7 +35,8 @@
         'python-dateutil==2.2',
         'six==1.4.1',
         'paramiko==1.12.2',
-        'boto>=2.5.2',
+        'boto==2.5.2',
+        'moto==0.2.21',
         'django-tastypie==0.9.15',
         'django-celery-with-redis==3.0',
         ],