summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/toaster/contrib/django-aggregate-if-master/tox.ini
diff options
context:
space:
mode:
authorElliot Smith <elliot.smith@intel.com>2016-01-15 13:01:03 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-15 16:30:01 +0000
commit059a274aa96ced872156806936f887969980dda6 (patch)
tree8494b689ce4ad1226fbf79b67b2e9189bf8640d5 /bitbake/lib/toaster/contrib/django-aggregate-if-master/tox.ini
parent4103e0cb748888d83a5a892b5a022d633846bce8 (diff)
downloadpoky-059a274aa96ced872156806936f887969980dda6.tar.gz
bitbake: toastergui: fix error and warning counts for builds
The error and warning counts displayed for builds were counts of the errors and warnings objects associated with a build. Because these values were being derived on the fly, it was not possible to sort by them. Previously, the 3rd party django-aggregate-if library was used to add aggregate fields to Build objects and should then have been used to populate the "all builds" and "project builds" tables. However, at some point the templates had changed so that the error and warning counts were coming from the properties on the Build model and not from these aggregates. This meant that it was not possible to sort by these fields. Django 1.8 supports conditional aggregates in annotation fields on querysets. This means we can remove django-aggregate-if, use the new Django 1.8 feature to derive errors_no and warnings_no fields as annotations, then use those annotation fields in the templates. This makes the "builds" tables sortable again. [YOCTO #8738] (Bitbake rev: 9be7c5c18b325f6ed40bc431ac408db242007eb1) Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/contrib/django-aggregate-if-master/tox.ini')
-rw-r--r--bitbake/lib/toaster/contrib/django-aggregate-if-master/tox.ini198
1 files changed, 0 insertions, 198 deletions
diff --git a/bitbake/lib/toaster/contrib/django-aggregate-if-master/tox.ini b/bitbake/lib/toaster/contrib/django-aggregate-if-master/tox.ini
deleted file mode 100644
index 78beb148aa..0000000000
--- a/bitbake/lib/toaster/contrib/django-aggregate-if-master/tox.ini
+++ /dev/null
@@ -1,198 +0,0 @@
1[tox]
2envlist =
3 py27-django1.4-sqlite,
4 py27-django1.4-postgres,
5 py27-django1.4-mysql,
6
7 py27-django1.5-sqlite,
8 py27-django1.5-postgres,
9 py27-django1.5-mysql,
10
11 py27-django1.6-sqlite,
12 py27-django1.6-postgres,
13 py27-django1.6-mysql,
14
15 py27-django1.7-sqlite,
16 py27-django1.7-postgres,
17 py27-django1.7-mysql,
18
19 py34-django1.6-sqlite,
20 py34-django1.6-postgres,
21 #py34-django1.6-mysql
22
23 py34-django1.7-sqlite,
24 py34-django1.7-postgres,
25 #py34-django1.7-mysql
26
27[testenv]
28whitelist_externals=
29 mysql
30 psql
31
32# Python 2.7
33# Django 1.4
34[testenv:py27-django1.4-sqlite]
35basepython = python2.7
36deps =
37 django==1.4
38commands = python runtests.py --settings tests.test_sqlite
39
40[testenv:py27-django1.4-postgres]
41basepython = python2.7
42deps =
43 django==1.4
44 psycopg2
45commands =
46 psql -c 'create database aggregation;' postgres
47 python runtests.py --settings tests.test_postgres
48 psql -c 'drop database aggregation;' postgres
49
50[testenv:py27-django1.4-mysql]
51basepython = python2.7
52deps =
53 django==1.4
54 mysql-python
55commands =
56 mysql -e 'create database aggregation;'
57 python runtests.py --settings tests.test_mysql
58 mysql -e 'drop database aggregation;'
59
60# Django 1.5
61[testenv:py27-django1.5-sqlite]
62basepython = python2.7
63deps =
64 django==1.5
65commands = python runtests.py --settings tests.test_sqlite
66
67[testenv:py27-django1.5-postgres]
68basepython = python2.7
69deps =
70 django==1.5
71 psycopg2
72commands =
73 psql -c 'create database aggregation;' postgres
74 python runtests.py --settings tests.test_postgres
75 psql -c 'drop database aggregation;' postgres
76
77[testenv:py27-django1.5-mysql]
78basepython = python2.7
79deps =
80 django==1.5
81 mysql-python
82commands =
83 mysql -e 'create database aggregation;'
84 python runtests.py --settings tests.test_mysql
85 mysql -e 'drop database aggregation;'
86
87# Django 1.6
88[testenv:py27-django1.6-sqlite]
89basepython = python2.7
90deps =
91 django==1.6
92commands = python runtests.py --settings tests.test_sqlite
93
94[testenv:py27-django1.6-postgres]
95basepython = python2.7
96deps =
97 django==1.6
98 psycopg2
99commands =
100 psql -c 'create database aggregation;' postgres
101 python runtests.py --settings tests.test_postgres
102 psql -c 'drop database aggregation;' postgres
103
104[testenv:py27-django1.6-mysql]
105basepython = python2.7
106deps =
107 django==1.6
108 mysql-python
109commands =
110 mysql -e 'create database aggregation;'
111 python runtests.py --settings tests.test_mysql
112 mysql -e 'drop database aggregation;'
113
114
115# Python 2.7 and Django 1.7
116[testenv:py27-django1.7-sqlite]
117basepython = python2.7
118deps =
119 django==1.7
120commands = python runtests.py --settings tests.test_sqlite
121
122[testenv:py27-django1.7-postgres]
123basepython = python2.7
124deps =
125 django==1.7
126 psycopg2
127commands =
128 psql -c 'create database aggregation;' postgres
129 python runtests.py --settings tests.test_postgres
130 psql -c 'drop database aggregation;' postgres
131
132[testenv:py27-django1.7-mysql]
133basepython = python2.7
134deps =
135 django==1.7
136 mysql-python
137commands =
138 mysql -e 'create database aggregation;'
139 python runtests.py --settings tests.test_mysql
140 mysql -e 'drop database aggregation;'
141
142
143# Python 3.4
144# Django 1.6
145[testenv:py34-django1.6-sqlite]
146basepython = python3.4
147deps =
148 django==1.6
149commands = python runtests.py --settings tests.test_sqlite
150
151[testenv:py34-django1.6-postgres]
152basepython = python3.4
153deps =
154 django==1.6
155 psycopg2
156commands =
157 psql -c 'create database aggregation;' postgres
158 python runtests.py --settings tests.test_postgres
159 psql -c 'drop database aggregation;' postgres
160
161[testenv:py34-django1.6-mysql]
162basepython = python3.4
163deps =
164 django==1.6
165 mysql-python3
166commands =
167 mysql -e 'create database aggregation;'
168 python runtests.py --settings tests.test_mysql
169 mysql -e 'drop database aggregation;'
170
171
172# Python 3.4
173# Django 1.7
174[testenv:py34-django1.7-sqlite]
175basepython = python3.4
176deps =
177 django==1.7
178commands = python runtests.py --settings tests.test_sqlite
179
180[testenv:py34-django1.7-postgres]
181basepython = python3.4
182deps =
183 django==1.7
184 psycopg2
185commands =
186 psql -c 'create database aggregation;' postgres
187 python runtests.py --settings tests.test_postgres
188 psql -c 'drop database aggregation;' postgres
189
190[testenv:py34-django1.7-mysql]
191basepython = python3.4
192deps =
193 django==1.7
194 mysql-python3
195commands =
196 mysql -e 'create database aggregation;'
197 python runtests.py --settings tests.test_mysql
198 mysql -e 'drop database aggregation;'