1 |
commit: 67db608aa284f34bb20132a1c1e93aa189928721 |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 27 08:59:29 2016 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 27 09:26:12 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67db608a |
7 |
|
8 |
dev-python/django-tables2: Drop old |
9 |
|
10 |
Package-Manager: portage-2.2.27 |
11 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
12 |
|
13 |
dev-python/django-tables2/Manifest | 5 - |
14 |
.../django-tables2/django-tables2-0.16.0-r1.ebuild | 25 ----- |
15 |
.../django-tables2/django-tables2-0.16.0.ebuild | 23 ---- |
16 |
.../django-tables2/django-tables2-1.0.4.ebuild | 23 ---- |
17 |
.../django-tables2/django-tables2-1.0.5.ebuild | 23 ---- |
18 |
.../django-tables2/django-tables2-1.0.6.ebuild | 23 ---- |
19 |
.../django-tables2/django-tables2-1.0.7.ebuild | 23 ---- |
20 |
...ngo-tables2-0.16.0-django-1.9-deprecation.patch | 118 --------------------- |
21 |
8 files changed, 263 deletions(-) |
22 |
|
23 |
diff --git a/dev-python/django-tables2/Manifest b/dev-python/django-tables2/Manifest |
24 |
index 097ff4f..49e61af 100644 |
25 |
--- a/dev-python/django-tables2/Manifest |
26 |
+++ b/dev-python/django-tables2/Manifest |
27 |
@@ -1,6 +1 @@ |
28 |
-DIST django-tables2-0.16.0.tar.gz 43672 SHA256 53a643166377c44a030d860f3c0f045c4b75e727432ddde4065a67c2df41bf33 SHA512 9d490bbcaab6049d74e81f25c0a2e1ebd3caa00930877661cc823dcfc429f020b3146ec778ccc840951e89f53047e8d6ad71cf7b689cfb76aa2eadf5db54280a WHIRLPOOL 907acbfb5599589ebf5dc49ebedd0f9e07003df7730a5bcc04667207140d9728fbed56afc08ed25167414bc4596a91e2106958223f5c48b5ccea2c6642b0365e |
29 |
-DIST django-tables2-1.0.4.tar.gz 57679 SHA256 801b1df349f07f5b548cf4b3d5cddfc26e5969079c7d490f179fb649e76d24af SHA512 ae1381ab23b93759caef259b5063c2149a71c9a808bc4f0a621de454872b354d03e8d7002a95de693e4d3c456366341ac30f200edac069244a0b97d156295953 WHIRLPOOL 03cfd673a16692de118b4eafb7a3fec277daef4045d16508c9a97abcdf2321782703fb4e12b9f26e7fddf799e1d8040028f43a0584f4bdc59f481c504f21586f |
30 |
-DIST django-tables2-1.0.5.tar.gz 981605 SHA256 f1407ab766b29acf753cdc1cd40e966589b2a57262e5ecc202c9f3b723f68a79 SHA512 460c1d7cf615e251671ab8aeb2fe396387cc0ef8f1bf3414c6b519ef528b7d16fa084669b5268b21ad5da6e85d0d0a94e2de159475e552b32ab4df5e12171c04 WHIRLPOOL 1f7dca4edd02aac180324c6f5207e66abb88bd373766837f47a8831a6e9fe8296d428afc3ea6f9878d9319f96b5d8d94c20dd504d59ce7637ffa0ef67b397bb3 |
31 |
-DIST django-tables2-1.0.6.tar.gz 970971 SHA256 29fda34506d220dba3e95c02b96fa3f323c91c8ffb6d957e51f49c29721752f6 SHA512 4b5d654c17ab2b38657e88ba8ee66170195b89b2490b09c66c9753b1710326353ff071e4a7baafaa44c26f2ec1f2985f03e36d073f64a6bfe6d8f02780aaf217 WHIRLPOOL 7904fc5795cc944a79949c34d6a3560b92c19450a3894d5bbf4cb748502c2e0082c9005c40106a7997f83272e03df53eca6e5a2e0b41bd85ac1c2f4c0532e59e |
32 |
-DIST django-tables2-1.0.7.tar.gz 966838 SHA256 6f837b75b209db7a2d2bf279a02946bddc53310ed7e753dec8469924e10eb7e2 SHA512 672568e421616a9982ea37e527c6ab8bd9b96bc7a835616bdd1be8e7d9b350e9e43d137d0aa704660a5b788c13a9247a67912bafbe531bea08a6787bc6595be7 WHIRLPOOL 044897173464ac87222e1282cf40df7646593ff125bd7ee535e83aec3989d69a00695bc9c2d367fb08c4114855ecf53af6524a441de7639b2ed9818ce6cdeb25 |
33 |
DIST django-tables2-1.1.0.tar.gz 966103 SHA256 46bdcae04087a20911dc10e30383743bca464696448e9351424efe2582a90499 SHA512 d7386df7651a3cdab42e40963d26594cd776614846fa7eda9208f0795b1f8c6270910904f44782480f0b782d0b139153805e41cdecd43f5bc2d30b67acb3fc6c WHIRLPOOL 11a4a573f96a198cd09b57a136bac1eaded18f704e1b117c7b4b49da26716447b31b1866d5da7058b3eb88e5372d5c9f6e0602a08ee221d03f20d617070c03a5 |
34 |
|
35 |
diff --git a/dev-python/django-tables2/django-tables2-0.16.0-r1.ebuild b/dev-python/django-tables2/django-tables2-0.16.0-r1.ebuild |
36 |
deleted file mode 100644 |
37 |
index d4992a7..0000000 |
38 |
--- a/dev-python/django-tables2/django-tables2-0.16.0-r1.ebuild |
39 |
+++ /dev/null |
40 |
@@ -1,25 +0,0 @@ |
41 |
-# Copyright 1999-2015 Gentoo Foundation |
42 |
-# Distributed under the terms of the GNU General Public License v2 |
43 |
-# $Id$ |
44 |
- |
45 |
-EAPI=5 |
46 |
- |
47 |
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy ) |
48 |
- |
49 |
-inherit distutils-r1 |
50 |
- |
51 |
-DESCRIPTION="Table/data-grid framework for Django" |
52 |
-HOMEPAGE="https://pypi.python.org/pypi/django-tables2/ https://github.com/bradleyayers/django-tables2/" |
53 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
54 |
- |
55 |
-SLOT="0" |
56 |
-LICENSE="BSD-2" |
57 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
58 |
-IUSE="" |
59 |
- |
60 |
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]" |
61 |
-DEPEND="${RDEPEND} |
62 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
63 |
-" |
64 |
- |
65 |
-PATCHES=( "${FILESDIR}"/${P}-django-1.9-deprecation.patch ) |
66 |
|
67 |
diff --git a/dev-python/django-tables2/django-tables2-0.16.0.ebuild b/dev-python/django-tables2/django-tables2-0.16.0.ebuild |
68 |
deleted file mode 100644 |
69 |
index 2f19150..0000000 |
70 |
--- a/dev-python/django-tables2/django-tables2-0.16.0.ebuild |
71 |
+++ /dev/null |
72 |
@@ -1,23 +0,0 @@ |
73 |
-# Copyright 1999-2015 Gentoo Foundation |
74 |
-# Distributed under the terms of the GNU General Public License v2 |
75 |
-# $Id$ |
76 |
- |
77 |
-EAPI=5 |
78 |
- |
79 |
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy ) |
80 |
- |
81 |
-inherit distutils-r1 |
82 |
- |
83 |
-DESCRIPTION="Table/data-grid framework for Django" |
84 |
-HOMEPAGE="https://pypi.python.org/pypi/django-tables2/ https://github.com/bradleyayers/django-tables2/" |
85 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
86 |
- |
87 |
-SLOT="0" |
88 |
-LICENSE="BSD-2" |
89 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
90 |
-IUSE="" |
91 |
- |
92 |
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]" |
93 |
-DEPEND="${RDEPEND} |
94 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
95 |
-" |
96 |
|
97 |
diff --git a/dev-python/django-tables2/django-tables2-1.0.4.ebuild b/dev-python/django-tables2/django-tables2-1.0.4.ebuild |
98 |
deleted file mode 100644 |
99 |
index 2f19150..0000000 |
100 |
--- a/dev-python/django-tables2/django-tables2-1.0.4.ebuild |
101 |
+++ /dev/null |
102 |
@@ -1,23 +0,0 @@ |
103 |
-# Copyright 1999-2015 Gentoo Foundation |
104 |
-# Distributed under the terms of the GNU General Public License v2 |
105 |
-# $Id$ |
106 |
- |
107 |
-EAPI=5 |
108 |
- |
109 |
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy ) |
110 |
- |
111 |
-inherit distutils-r1 |
112 |
- |
113 |
-DESCRIPTION="Table/data-grid framework for Django" |
114 |
-HOMEPAGE="https://pypi.python.org/pypi/django-tables2/ https://github.com/bradleyayers/django-tables2/" |
115 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
116 |
- |
117 |
-SLOT="0" |
118 |
-LICENSE="BSD-2" |
119 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
120 |
-IUSE="" |
121 |
- |
122 |
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]" |
123 |
-DEPEND="${RDEPEND} |
124 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
125 |
-" |
126 |
|
127 |
diff --git a/dev-python/django-tables2/django-tables2-1.0.5.ebuild b/dev-python/django-tables2/django-tables2-1.0.5.ebuild |
128 |
deleted file mode 100644 |
129 |
index 2f19150..0000000 |
130 |
--- a/dev-python/django-tables2/django-tables2-1.0.5.ebuild |
131 |
+++ /dev/null |
132 |
@@ -1,23 +0,0 @@ |
133 |
-# Copyright 1999-2015 Gentoo Foundation |
134 |
-# Distributed under the terms of the GNU General Public License v2 |
135 |
-# $Id$ |
136 |
- |
137 |
-EAPI=5 |
138 |
- |
139 |
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy ) |
140 |
- |
141 |
-inherit distutils-r1 |
142 |
- |
143 |
-DESCRIPTION="Table/data-grid framework for Django" |
144 |
-HOMEPAGE="https://pypi.python.org/pypi/django-tables2/ https://github.com/bradleyayers/django-tables2/" |
145 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
146 |
- |
147 |
-SLOT="0" |
148 |
-LICENSE="BSD-2" |
149 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
150 |
-IUSE="" |
151 |
- |
152 |
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]" |
153 |
-DEPEND="${RDEPEND} |
154 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
155 |
-" |
156 |
|
157 |
diff --git a/dev-python/django-tables2/django-tables2-1.0.6.ebuild b/dev-python/django-tables2/django-tables2-1.0.6.ebuild |
158 |
deleted file mode 100644 |
159 |
index 2f19150..0000000 |
160 |
--- a/dev-python/django-tables2/django-tables2-1.0.6.ebuild |
161 |
+++ /dev/null |
162 |
@@ -1,23 +0,0 @@ |
163 |
-# Copyright 1999-2015 Gentoo Foundation |
164 |
-# Distributed under the terms of the GNU General Public License v2 |
165 |
-# $Id$ |
166 |
- |
167 |
-EAPI=5 |
168 |
- |
169 |
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy ) |
170 |
- |
171 |
-inherit distutils-r1 |
172 |
- |
173 |
-DESCRIPTION="Table/data-grid framework for Django" |
174 |
-HOMEPAGE="https://pypi.python.org/pypi/django-tables2/ https://github.com/bradleyayers/django-tables2/" |
175 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
176 |
- |
177 |
-SLOT="0" |
178 |
-LICENSE="BSD-2" |
179 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
180 |
-IUSE="" |
181 |
- |
182 |
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]" |
183 |
-DEPEND="${RDEPEND} |
184 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
185 |
-" |
186 |
|
187 |
diff --git a/dev-python/django-tables2/django-tables2-1.0.7.ebuild b/dev-python/django-tables2/django-tables2-1.0.7.ebuild |
188 |
deleted file mode 100644 |
189 |
index a82680e..0000000 |
190 |
--- a/dev-python/django-tables2/django-tables2-1.0.7.ebuild |
191 |
+++ /dev/null |
192 |
@@ -1,23 +0,0 @@ |
193 |
-# Copyright 1999-2016 Gentoo Foundation |
194 |
-# Distributed under the terms of the GNU General Public License v2 |
195 |
-# $Id$ |
196 |
- |
197 |
-EAPI=5 |
198 |
- |
199 |
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy ) |
200 |
- |
201 |
-inherit distutils-r1 |
202 |
- |
203 |
-DESCRIPTION="Table/data-grid framework for Django" |
204 |
-HOMEPAGE="https://pypi.python.org/pypi/django-tables2/ https://github.com/bradleyayers/django-tables2/" |
205 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
206 |
- |
207 |
-SLOT="0" |
208 |
-LICENSE="BSD-2" |
209 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
210 |
-IUSE="" |
211 |
- |
212 |
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]" |
213 |
-DEPEND="${RDEPEND} |
214 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
215 |
-" |
216 |
|
217 |
diff --git a/dev-python/django-tables2/files/django-tables2-0.16.0-django-1.9-deprecation.patch b/dev-python/django-tables2/files/django-tables2-0.16.0-django-1.9-deprecation.patch |
218 |
deleted file mode 100644 |
219 |
index 12460d4..0000000 |
220 |
--- a/dev-python/django-tables2/files/django-tables2-0.16.0-django-1.9-deprecation.patch |
221 |
+++ /dev/null |
222 |
@@ -1,118 +0,0 @@ |
223 |
-From cb71f869bbc8aac3a14f3d4d1f67641e21892bba Mon Sep 17 00:00:00 2001 |
224 |
-From: Gert Steyn <gert@×××××××××.com> |
225 |
-Date: Thu, 19 Mar 2015 12:20:42 +0200 |
226 |
-Subject: [PATCH] Changed from django.utils.datastructures.SortedDict |
227 |
- (deprecated) to collections.OrderedDict |
228 |
- |
229 |
---- |
230 |
- django_tables2/columns/base.py | 6 +++--- |
231 |
- django_tables2/tables.py | 10 +++++----- |
232 |
- django_tables2/templatetags/django_tables2.py | 4 ++-- |
233 |
- 3 files changed, 10 insertions(+), 10 deletions(-) |
234 |
- |
235 |
-diff --git a/django_tables2/columns/base.py b/django_tables2/columns/base.py |
236 |
-index 20b3477..3b377e6 100644 |
237 |
---- a/django_tables2/columns/base.py |
238 |
-+++ b/django_tables2/columns/base.py |
239 |
-@@ -1,9 +1,9 @@ |
240 |
- # coding: utf-8 |
241 |
- from __future__ import absolute_import, unicode_literals |
242 |
- from django.db.models.fields import FieldDoesNotExist |
243 |
--from django.utils.datastructures import SortedDict |
244 |
- from django_tables2.templatetags.django_tables2 import title |
245 |
- from django_tables2.utils import A, AttributeDict, OrderBy, OrderByTuple |
246 |
-+from collections import OrderedDict |
247 |
- from itertools import islice |
248 |
- import six |
249 |
- import warnings |
250 |
-@@ -498,7 +498,7 @@ class BoundColumns(object): |
251 |
- A `BoundColumns` object is a container for holding `BoundColumn` objects. |
252 |
- It provides methods that make accessing columns easier than if they were |
253 |
- stored in a `list` or `dict`. `Columns` has a similar API to a `dict` (it |
254 |
-- actually uses a `~django.utils.datastructures.SortedDict` interally). |
255 |
-+ actually uses a `~collections.OrderedDict` interally). |
256 |
- |
257 |
- At the moment you'll only come across this class when you access a |
258 |
- `.Table.columns` property. |
259 |
-@@ -508,7 +508,7 @@ class BoundColumns(object): |
260 |
- """ |
261 |
- def __init__(self, table): |
262 |
- self.table = table |
263 |
-- self.columns = SortedDict() |
264 |
-+ self.columns = OrderedDict() |
265 |
- for name, column in six.iteritems(table.base_columns): |
266 |
- self.columns[name] = bc = BoundColumn(table, column, name) |
267 |
- bc.render = getattr(table, 'render_' + name, column.render) |
268 |
-diff --git a/django_tables2/tables.py b/django_tables2/tables.py |
269 |
-index 01a0671..2f31069 100644 |
270 |
---- a/django_tables2/tables.py |
271 |
-+++ b/django_tables2/tables.py |
272 |
-@@ -9,9 +9,9 @@ |
273 |
- import sys |
274 |
- from django.core.paginator import Paginator |
275 |
- from django.db.models.fields import FieldDoesNotExist |
276 |
--from django.utils.datastructures import SortedDict |
277 |
- from django.template import RequestContext |
278 |
- from django.template.loader import get_template |
279 |
-+from collections import OrderedDict |
280 |
- import six |
281 |
- import warnings |
282 |
- |
283 |
-@@ -172,10 +172,10 @@ def __new__(mcs, name, bases, attrs): |
284 |
- if hasattr(base, "base_columns"): |
285 |
- parent_columns = list(base.base_columns.items()) + parent_columns |
286 |
- # Start with the parent columns |
287 |
-- attrs["base_columns"] = SortedDict(parent_columns) |
288 |
-+ attrs["base_columns"] = OrderedDict(parent_columns) |
289 |
- # Possibly add some generated columns based on a model |
290 |
- if opts.model: |
291 |
-- extra = SortedDict() |
292 |
-+ extra = OrderedDict() |
293 |
- # honor Table.Meta.fields, fallback to model._meta.fields |
294 |
- if opts.fields: |
295 |
- # Each item in opts.fields is the name of a model field or a |
296 |
-@@ -194,7 +194,7 @@ def __new__(mcs, name, bases, attrs): |
297 |
- attrs["base_columns"].update(extra) |
298 |
- |
299 |
- # Explicit columns override both parent and generated columns |
300 |
-- attrs["base_columns"].update(SortedDict(cols)) |
301 |
-+ attrs["base_columns"].update(OrderedDict(cols)) |
302 |
- # Apply any explicit exclude setting |
303 |
- for exclusion in opts.exclude: |
304 |
- if exclusion in attrs["base_columns"]: |
305 |
-@@ -204,7 +204,7 @@ def __new__(mcs, name, bases, attrs): |
306 |
- opts.sequence.expand(attrs["base_columns"].keys()) |
307 |
- # Table's sequence defaults to sequence declared in Meta |
308 |
- #attrs['_sequence'] = opts.sequence |
309 |
-- attrs["base_columns"] = SortedDict(((x, attrs["base_columns"][x]) for x in opts.sequence)) |
310 |
-+ attrs["base_columns"] = OrderedDict(((x, attrs["base_columns"][x]) for x in opts.sequence)) |
311 |
- |
312 |
- # set localize on columns |
313 |
- for col_name in attrs["base_columns"].keys(): |
314 |
-diff --git a/django_tables2/templatetags/django_tables2.py b/django_tables2/templatetags/django_tables2.py |
315 |
-index 1e72d74..1ca91de 100644 |
316 |
---- a/django_tables2/templatetags/django_tables2.py |
317 |
-+++ b/django_tables2/templatetags/django_tables2.py |
318 |
-@@ -5,12 +5,12 @@ |
319 |
- from django.template import TemplateSyntaxError, Variable, Node |
320 |
- from django.template.loader import get_template, select_template |
321 |
- from django.template.defaultfilters import stringfilter, title as old_title |
322 |
--from django.utils.datastructures import SortedDict |
323 |
- from django.utils.http import urlencode |
324 |
- from django.utils.html import escape |
325 |
- from django.utils.safestring import mark_safe |
326 |
- import django_tables2 as tables |
327 |
- from django_tables2.config import RequestConfig |
328 |
-+from collections import OrderedDict |
329 |
- import re |
330 |
- import six |
331 |
- import tokenize |
332 |
-@@ -35,7 +35,7 @@ def token_kwargs(bits, parser): |
333 |
- """ |
334 |
- if not bits: |
335 |
- return {} |
336 |
-- kwargs = SortedDict() |
337 |
-+ kwargs = OrderedDict() |
338 |
- while bits: |
339 |
- match = kwarg_re.match(bits[0]) |
340 |
- if not match or not match.group(1): |