Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/django-pipeline/files/, dev-python/django-pipeline/
Date: Wed, 03 Jan 2018 09:12:09
Message-Id: 1514970689.8ca468344b751dc80ed83dec13352002ca2fbe77.mgorny@gentoo
1 commit: 8ca468344b751dc80ed83dec13352002ca2fbe77
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 2 22:53:22 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 3 09:11:29 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ca46834
7
8 dev-python/django-pipeline: Clean old up
9
10 dev-python/django-pipeline/Manifest | 1 -
11 .../django-pipeline/django-pipeline-1.3.26.ebuild | 54 ------------------
12 .../django-pipeline/files/1.3.26-tests.patch | 64 ----------------------
13 3 files changed, 119 deletions(-)
14
15 diff --git a/dev-python/django-pipeline/Manifest b/dev-python/django-pipeline/Manifest
16 index 099b88aa056..7a10bb27393 100644
17 --- a/dev-python/django-pipeline/Manifest
18 +++ b/dev-python/django-pipeline/Manifest
19 @@ -1,2 +1 @@
20 -DIST django-pipeline-1.3.26.tar.gz 41054 BLAKE2B 0082186d742b0fd965546e7aba8275b2381c34239a164f73c8507cafaa68ba9f242c281dba27896bc080f43f28c731fb36dbbb83449e2976acaa593981f1b08e SHA512 106c89e6a5509305548f6169f9b38d3a288bdf260c4b933ac1372c8471e897b8f6109cdecf70a4f77dff670e2b97abe4ed990903abfc188a59600189d0473284
21 DIST django-pipeline-1.6.0.tar.gz 41822 BLAKE2B 4917c527103522114b31afb0e9dbdcb202b0181d6634eaa4baac632a05c0ecab4502a3d4e13e97413268db582833df71f3f6df088b07ae8a354574331d2a9026 SHA512 4cf89f34a56aeb7cd5042617c265fb4bccfe7a0c32c26d50a0820d35c18207cdbf68b43e8f51ef7145fc48576ae0fe0a21553a75ec8a0a21a3c62e7699268d73
22
23 diff --git a/dev-python/django-pipeline/django-pipeline-1.3.26.ebuild b/dev-python/django-pipeline/django-pipeline-1.3.26.ebuild
24 deleted file mode 100644
25 index 5f1e37ee877..00000000000
26 --- a/dev-python/django-pipeline/django-pipeline-1.3.26.ebuild
27 +++ /dev/null
28 @@ -1,54 +0,0 @@
29 -# Copyright 1999-2015 Gentoo Foundation
30 -# Distributed under the terms of the GNU General Public License v2
31 -
32 -EAPI=5
33 -PYTHON_COMPAT=( python{2_7,3_4} pypy )
34 -
35 -inherit distutils-r1
36 -
37 -DESCRIPTION="An asset packaging library for Django"
38 -HOMEPAGE="https://pypi.python.org/pypi/django-pipeline/ https://github.com/cyberdelia/django-pipeline"
39 -
40 -# PyPi releases lack docs/ subdir:
41 -# https://github.com/cyberdelia/django-pipeline/pull/254
42 -SRC_URI="https://github.com/cyberdelia/django-pipeline/archive/${PV}.tar.gz -> ${P}.tar.gz"
43 -
44 -LICENSE="MIT"
45 -SLOT="0"
46 -KEYWORDS="amd64 x86"
47 -IUSE="doc test"
48 -
49 -RDEPEND=">=dev-python/django-1.5.8[${PYTHON_USEDEP}]
50 - dev-python/jsmin[${PYTHON_USEDEP}]
51 - dev-python/jinja[${PYTHON_USEDEP}]
52 - virtual/python-futures[${PYTHON_USEDEP}]"
53 -DEPEND="
54 - dev-python/setuptools[${PYTHON_USEDEP}]
55 - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
56 - test? ( ${RDEPEND}
57 - dev-python/mock[${PYTHON_USEDEP}] )"
58 -
59 -PATCHES=( "${FILESDIR}"/${PV}-tests.patch )
60 -
61 -# As usual for test phase
62 -DISTUTILS_IN_SOURCE_BUILD=1
63 -
64 -python_compile_all() {
65 - use doc && emake -C docs html
66 -}
67 -
68 -python_test() {
69 - # https://github.com/cyberdelia/django-pipeline/issues/381
70 - PYTHONPATH=. django-admin.py test --settings=tests.settings tests \
71 - || die "Tests failed under ${EPYTHON}"
72 -}
73 -
74 -python_install_all() {
75 - use doc && HTML_DOCS=( docs/_build/html/. )
76 - distutils-r1_python_install_all
77 -}
78 -
79 -python_install() {
80 - export PIPELINE_JS_COMPRESSOR = 'pipeline.compressors.jsmin.JSMinCompressor'
81 - distutils-r1_python_install
82 -}
83
84 diff --git a/dev-python/django-pipeline/files/1.3.26-tests.patch b/dev-python/django-pipeline/files/1.3.26-tests.patch
85 deleted file mode 100644
86 index 5cdf5e760c9..00000000000
87 --- a/dev-python/django-pipeline/files/1.3.26-tests.patch
88 +++ /dev/null
89 @@ -1,64 +0,0 @@
90 -https://github.com/cyberdelia/django-pipeline/commit/ba7b8d0d1cb621521a2025fed3e60786a010836d
91 -diff --git a/docs/configuration.rst b/docs/configuration.rst
92 -index 4385e23..e200bc3 100644
93 ---- a/docs/configuration.rst
94 -+++ b/docs/configuration.rst
95 -@@ -185,7 +185,7 @@ Other settings
96 - (
97 - (b'text/coffeescript', '.coffee'),
98 - (b'text/less', '.less'),
99 -- (b'application/javascript', '.js'),
100 -+ (b'text/javascript', '.js'),
101 - (b'text/x-sass', '.sass'),
102 - (b'text/x-scss', '.scss')
103 - )
104 -diff --git a/tests/tests/test_template.py b/tests/tests/test_template.py
105 -index 84b6957..a303d03 100644
106 ---- a/tests/tests/test_template.py
107 -+++ b/tests/tests/test_template.py
108 -@@ -35,19 +35,19 @@ def test_package_css_disabled(self):
109 -
110 - def test_package_js(self):
111 - template = self.env.from_string(u"""{% compressed_js "scripts" %}""")
112 -- self.assertEqual(u'<script type="application/javascript" src="/static/scripts.js" charset="utf-8"></script>', template.render())
113 -+ self.assertEqual(u'<script type="text/javascript" src="/static/scripts.js" charset="utf-8"></script>', template.render())
114 -
115 - def test_package_js_async(self):
116 - template = self.env.from_string(u"""{% compressed_js "scripts_async" %}""")
117 -- self.assertEqual(u'<script async type="application/javascript" src="/static/scripts_async.js" charset="utf-8"></script>', template.render())
118 -+ self.assertEqual(u'<script async type="text/javascript" src="/static/scripts_async.js" charset="utf-8"></script>', template.render())
119 -
120 - def test_package_js_defer(self):
121 - template = self.env.from_string(u"""{% compressed_js "scripts_defer" %}""")
122 -- self.assertEqual(u'<script defer type="application/javascript" src="/static/scripts_defer.js" charset="utf-8"></script>', template.render())
123 -+ self.assertEqual(u'<script defer type="text/javascript" src="/static/scripts_defer.js" charset="utf-8"></script>', template.render())
124 -
125 - def test_package_js_async_defer(self):
126 - template = self.env.from_string(u"""{% compressed_js "scripts_async_defer" %}""")
127 -- self.assertEqual(u'<script async defer type="application/javascript" src="/static/scripts_async_defer.js" charset="utf-8"></script>', template.render())
128 -+ self.assertEqual(u'<script async defer type="text/javascript" src="/static/scripts_async_defer.js" charset="utf-8"></script>', template.render())
129 -
130 -
131 - class DjangoTest(TestCase):
132 -@@ -64,16 +64,16 @@ def test_compressed_css(self):
133 -
134 - def test_compressed_js(self):
135 - rendered = self.render_template(u"""{% load compressed %}{% compressed_js "scripts" %}""")
136 -- self.assertEqual(u'<script type="application/javascript" src="/static/scripts.js" charset="utf-8"></script>', rendered)
137 -+ self.assertEqual(u'<script type="text/javascript" src="/static/scripts.js" charset="utf-8"></script>', rendered)
138 -
139 - def test_compressed_js_async(self):
140 - rendered = self.render_template(u"""{% load compressed %}{% compressed_js "scripts_async" %}""")
141 -- self.assertEqual(u'<script async type="application/javascript" src="/static/scripts_async.js" charset="utf-8"></script>', rendered)
142 -+ self.assertEqual(u'<script async type="text/javascript" src="/static/scripts_async.js" charset="utf-8"></script>', rendered)
143 -
144 - def test_compressed_js_defer(self):
145 - rendered = self.render_template(u"""{% load compressed %}{% compressed_js "scripts_defer" %}""")
146 -- self.assertEqual(u'<script defer type="application/javascript" src="/static/scripts_defer.js" charset="utf-8"></script>', rendered)
147 -+ self.assertEqual(u'<script defer type="text/javascript" src="/static/scripts_defer.js" charset="utf-8"></script>', rendered)
148 -
149 - def test_compressed_js_async_defer(self):
150 - rendered = self.render_template(u"""{% load compressed %}{% compressed_js "scripts_async_defer" %}""")
151 -- self.assertEqual(u'<script async defer type="application/javascript" src="/static/scripts_async_defer.js" charset="utf-8"></script>', rendered)
152 -+ self.assertEqual(u'<script async defer type="text/javascript" src="/static/scripts_async_defer.js" charset="utf-8"></script>', rendered)
153 -