Merge lp:~davidc3/developer-ubuntu-com/upgrade-django-on-all-envs into lp:developer-ubuntu-com

[David Callé]

Fix upgrade commands to work on all envs

[lp:~davidc3/developer-ubuntu-com/upgrade-django-on-all-envs]

174. By David Callé on 2015-11-19

update requirements

175. By David Callé on 2015-11-19

Simplify

=== modified file 'Makefile'
--- Makefile	2015-11-19 09:02:40 +0000
+++ Makefile	2015-11-19 10:42:24 +0000
@@ -4,28 +4,7 @@
 REVNO := `bzr revno`
 
 update-1470715:
-	./env/bin/pip install -r requirements.txt --upgrade
-	./env/bin/pip uninstall -yq South
-	./env/bin/python manage.py migrate --fake admin
-	./env/bin/python manage.py migrate --fake sessions
-	./env/bin/python manage.py migrate --fake sites
-	./env/bin/python manage.py migrate --fake cms 0001_initial
-	./env/bin/python manage.py migrate --fake cms 0002_auto_20140816_1918
-	./env/bin/python manage.py migrate --fake cmsplugin_zinnia
-	./env/bin/python manage.py migrate --fake djangocms_link 0001_initial
-	./env/bin/python manage.py migrate --fake djangocms_picture
-	./env/bin/python manage.py migrate --fake djangocms_snippet 0001_initial
-	./env/bin/python manage.py migrate --fake djangocms_text_ckeditor
-	./env/bin/python manage.py migrate --fake djangocms_video
-	./env/bin/python manage.py migrate --fake django_comments 0001_initial
-	./env/bin/python manage.py migrate --fake menus
-	./env/bin/python manage.py migrate --fake reversion 0001_initial
-	./env/bin/python manage.py migrate cms
-	./env/bin/python manage.py migrate --fake developer_portal
-	./env/bin/python manage.py migrate --fake api_docs
-	./env/bin/python manage.py migrate --fake django_openid_auth 0001_initial
-	./env/bin/python manage.py migrate --fake store_data 0001_initial
-	./env/bin/python manage.py migrate
+	@python manage.py migrate
 
 update-instance:
 	@echo "Nothing to do for the app";

=== modified file 'requirements.txt'
--- requirements.txt	2015-11-19 09:02:40 +0000
+++ requirements.txt	2015-11-19 10:42:24 +0000
@@ -38,8 +38,8 @@
 djangocms-text-ckeditor==2.7.0
 djangocms-utils==0.9.5
 djangocms-video==0.1
-python-keystoneclient==1.3.3
-python-swiftclient==2.6.0
+python-keystoneclient==0.11.2
+python-swiftclient==2.3.1
 pytz==2015.7
 simple-translation==0.8.6
 simplejson==3.8.1