From: Elliot Smith <[email protected]> Upgrade Django to long-term support version.
Django now provides its own migration framework, so remove requirement for South. [YOCTO #8364] Signed-off-by: Elliot Smith <[email protected]> Signed-off-by: Ed Bartosh <[email protected]> --- bitbake/bin/toaster | 8 ++------ bitbake/lib/toaster/toastermain/settings.py | 1 - bitbake/toaster-requirements.txt | 3 +-- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster index 6d1ec05..528e17e 100755 --- a/bitbake/bin/toaster +++ b/bitbake/bin/toaster @@ -176,15 +176,11 @@ notify_chldexit() { verify_prereq() { # 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 - printf "This program needs Django 1.6. Please install with\n\npip install django==1.6\n" + 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.8. Please install with\n\npip install django<=1.8.7\n" return 2 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 } diff --git a/bitbake/lib/toaster/toastermain/settings.py b/bitbake/lib/toaster/toastermain/settings.py index de686b2..7c559bc 100644 --- a/bitbake/lib/toaster/toastermain/settings.py +++ b/bitbake/lib/toaster/toastermain/settings.py @@ -276,7 +276,6 @@ INSTALLED_APPS = ( 'django.contrib.humanize', 'bldcollector', 'toastermain', - 'south', ) diff --git a/bitbake/toaster-requirements.txt b/bitbake/toaster-requirements.txt index 1d7d21b..5d34494 100644 --- a/bitbake/toaster-requirements.txt +++ b/bitbake/toaster-requirements.txt @@ -1,5 +1,4 @@ -Django==1.6 -South==0.8.4 +Django==1.8.6 argparse==1.2.1 wsgiref==0.1.2 beautifulsoup4>=4.4.0 -- 2.1.4 -- _______________________________________________ toaster mailing list [email protected] https://lists.yoctoproject.org/listinfo/toaster
