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

Proposed by David Callé on 2015-11-19
Status: Merged
Merged at revision: 175
Proposed branch: lp:~davidc3/developer-ubuntu-com/upgrade-django-on-all-envs
Merge into: lp:developer-ubuntu-com
Diff against target: 48 lines (+3/-24)
2 files modified
Makefile (+1/-22)
requirements.txt (+2/-2)
To merge this branch: bzr merge lp:~davidc3/developer-ubuntu-com/upgrade-django-on-all-envs
Reviewer Review Type Date Requested Status
Ubuntu App Developer site developers 2015-11-19 Pending
Review via email: mp+277965@code.launchpad.net

Description of the change

Fix upgrade commands to work on all envs

To post a comment you must log in.
174. By David Callé on 2015-11-19

update requirements

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

Simplify

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2015-11-19 09:02:40 +0000
3+++ Makefile 2015-11-19 10:42:24 +0000
4@@ -4,28 +4,7 @@
5 REVNO := `bzr revno`
6
7 update-1470715:
8- ./env/bin/pip install -r requirements.txt --upgrade
9- ./env/bin/pip uninstall -yq South
10- ./env/bin/python manage.py migrate --fake admin
11- ./env/bin/python manage.py migrate --fake sessions
12- ./env/bin/python manage.py migrate --fake sites
13- ./env/bin/python manage.py migrate --fake cms 0001_initial
14- ./env/bin/python manage.py migrate --fake cms 0002_auto_20140816_1918
15- ./env/bin/python manage.py migrate --fake cmsplugin_zinnia
16- ./env/bin/python manage.py migrate --fake djangocms_link 0001_initial
17- ./env/bin/python manage.py migrate --fake djangocms_picture
18- ./env/bin/python manage.py migrate --fake djangocms_snippet 0001_initial
19- ./env/bin/python manage.py migrate --fake djangocms_text_ckeditor
20- ./env/bin/python manage.py migrate --fake djangocms_video
21- ./env/bin/python manage.py migrate --fake django_comments 0001_initial
22- ./env/bin/python manage.py migrate --fake menus
23- ./env/bin/python manage.py migrate --fake reversion 0001_initial
24- ./env/bin/python manage.py migrate cms
25- ./env/bin/python manage.py migrate --fake developer_portal
26- ./env/bin/python manage.py migrate --fake api_docs
27- ./env/bin/python manage.py migrate --fake django_openid_auth 0001_initial
28- ./env/bin/python manage.py migrate --fake store_data 0001_initial
29- ./env/bin/python manage.py migrate
30+ @python manage.py migrate
31
32 update-instance:
33 @echo "Nothing to do for the app";
34
35=== modified file 'requirements.txt'
36--- requirements.txt 2015-11-19 09:02:40 +0000
37+++ requirements.txt 2015-11-19 10:42:24 +0000
38@@ -38,8 +38,8 @@
39 djangocms-text-ckeditor==2.7.0
40 djangocms-utils==0.9.5
41 djangocms-video==0.1
42-python-keystoneclient==1.3.3
43-python-swiftclient==2.6.0
44+python-keystoneclient==0.11.2
45+python-swiftclient==2.3.1
46 pytz==2015.7
47 simple-translation==0.8.6
48 simplejson==3.8.1

Subscribers

People subscribed via source and target branches