bitbake: toaster: Upgrade to Django 1.8.6 and remove South
Upgrade Django to long-term support version. Django now provides its own migration framework, so remove requirement for South. [YOCTO #8364] (Bitbake rev: 648b62654c52116451c6a68a46d7264db3a34d09) Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
b322dec016
commit
8ca46641ef
|
@ -176,15 +176,11 @@ notify_chldexit() {
|
||||||
verify_prereq() {
|
verify_prereq() {
|
||||||
# Verify prerequisites
|
# Verify prerequisites
|
||||||
|
|
||||||
if ! echo "import django; print (1,) == django.VERSION[0:1] and django.VERSION[1:2][0] in (6,)" | python 2>/dev/null | grep True >/dev/null; then
|
if ! echo "import django; print (1,) == django.VERSION[0:1] and django.VERSION[1:2][0] in (8,)" | python 2>/dev/null | grep True >/dev/null; then
|
||||||
printf "This program needs Django 1.6. Please install with\n\npip install django==1.6\n"
|
printf "This program needs Django 1.8. Please install with\n\npip install django<=1.8.7\n"
|
||||||
return 2
|
return 2
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! echo "import south; print reduce(lambda x, y: 2 if x==2 else 0 if x == 0 else y, map(lambda x: 1+cmp(x[1]-x[0],0), zip([0,8,4], map(int,south.__version__.split(\".\"))))) > 0" | python 2>/dev/null | grep True >/dev/null; then
|
|
||||||
printf "This program needs South 0.8.4. Please install with\n\npip install south==0.8.4\n"
|
|
||||||
return 2
|
|
||||||
fi
|
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -276,7 +276,6 @@ INSTALLED_APPS = (
|
||||||
'django.contrib.humanize',
|
'django.contrib.humanize',
|
||||||
'bldcollector',
|
'bldcollector',
|
||||||
'toastermain',
|
'toastermain',
|
||||||
'south',
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
Django==1.6
|
Django==1.8.6
|
||||||
South==0.8.4
|
|
||||||
argparse==1.2.1
|
argparse==1.2.1
|
||||||
wsgiref==0.1.2
|
wsgiref==0.1.2
|
||||||
beautifulsoup4>=4.4.0
|
beautifulsoup4>=4.4.0
|
||||||
|
|
Loading…
Reference in New Issue