summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake')
-rwxr-xr-xbitbake/bin/toaster8
-rw-r--r--bitbake/lib/toaster/toastermain/settings.py1
-rw-r--r--bitbake/toaster-requirements.txt3
3 files changed, 3 insertions, 9 deletions
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
index 6d1ec0573a..528e17e41f 100755
--- a/bitbake/bin/toaster
+++ b/bitbake/bin/toaster
@@ -176,15 +176,11 @@ notify_chldexit() {
176verify_prereq() { 176verify_prereq() {
177 # Verify prerequisites 177 # Verify prerequisites
178 178
179 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 179 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
180 printf "This program needs Django 1.6. Please install with\n\npip install django==1.6\n" 180 printf "This program needs Django 1.8. Please install with\n\npip install django<=1.8.7\n"
181 return 2 181 return 2
182 fi 182 fi
183 183
184 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
185 printf "This program needs South 0.8.4. Please install with\n\npip install south==0.8.4\n"
186 return 2
187 fi
188 return 0 184 return 0
189} 185}
190 186
diff --git a/bitbake/lib/toaster/toastermain/settings.py b/bitbake/lib/toaster/toastermain/settings.py
index de686b2edc..7c559bc7a1 100644
--- a/bitbake/lib/toaster/toastermain/settings.py
+++ b/bitbake/lib/toaster/toastermain/settings.py
@@ -276,7 +276,6 @@ INSTALLED_APPS = (
276 'django.contrib.humanize', 276 'django.contrib.humanize',
277 'bldcollector', 277 'bldcollector',
278 'toastermain', 278 'toastermain',
279 'south',
280) 279)
281 280
282 281
diff --git a/bitbake/toaster-requirements.txt b/bitbake/toaster-requirements.txt
index 1d7d21b331..5d34494d54 100644
--- a/bitbake/toaster-requirements.txt
+++ b/bitbake/toaster-requirements.txt
@@ -1,5 +1,4 @@
1Django==1.6 1Django==1.8.6
2South==0.8.4
3argparse==1.2.1 2argparse==1.2.1
4wsgiref==0.1.2 3wsgiref==0.1.2
5beautifulsoup4>=4.4.0 4beautifulsoup4>=4.4.0