1 |
commit: 9bc67f23d907be5b2e803c4e808a84fa800229d5 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 6 20:33:07 2022 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 6 20:33:07 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bc67f23 |
7 |
|
8 |
dev-python/bottle: Remove old |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-python/bottle/Manifest | 1 - |
13 |
dev-python/bottle/bottle-0.12.21.ebuild | 55 ---------------------- |
14 |
dev-python/bottle/files/bottle-0.12.19-py311.patch | 45 ------------------ |
15 |
.../files/bottle-0.12.8-py3.5-backport.patch | 36 -------------- |
16 |
4 files changed, 137 deletions(-) |
17 |
|
18 |
diff --git a/dev-python/bottle/Manifest b/dev-python/bottle/Manifest |
19 |
index 4b1105c6afb0..a4d5566e86b3 100644 |
20 |
--- a/dev-python/bottle/Manifest |
21 |
+++ b/dev-python/bottle/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
-DIST bottle-0.12.21.tar.gz 74229 BLAKE2B 88674389d2c087a7416443d031995ee923a98b790eb85d81b625f11b2fb0baee35d90a3ee2dba5b9d4744a343a34396a50edef0f85a2d6f4f0f4da95bae31b5b SHA512 3d621f6684f439a4a5718ad25e8b45eb0d1100cd565ec5b797adf67141e01d835cde671e687f5515cb6eab69bb465e9c7d004131634609266c2e1b69b0adbf43 |
24 |
DIST bottle-0.12.23.tar.gz 73965 BLAKE2B ccd3dc3aad5c4c8b6899f55f03550cf9178e51788c27ece9808e1cff92693cc09dab145be16f814d29dae02ce53374a0470b2c4b032bc66a0ec2b1a11ec5ca44 SHA512 0550aa95680dd79d9c63c5de854845377183c86015893d9ee4e67126eca201582ef79d40ff0d1cbe79fe8a250118a775c63102475e337e18cfc1a65afe18f62a |
25 |
|
26 |
diff --git a/dev-python/bottle/bottle-0.12.21.ebuild b/dev-python/bottle/bottle-0.12.21.ebuild |
27 |
deleted file mode 100644 |
28 |
index 5f1690c5bbf0..000000000000 |
29 |
--- a/dev-python/bottle/bottle-0.12.21.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,55 +0,0 @@ |
32 |
-# Copyright 1999-2022 Gentoo Authors |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
- |
35 |
-EAPI=8 |
36 |
- |
37 |
-DISTUTILS_USE_PEP517=setuptools |
38 |
-PYTHON_COMPAT=( python3_{8..11} pypy3 ) |
39 |
- |
40 |
-inherit distutils-r1 optfeature |
41 |
- |
42 |
-DESCRIPTION="A fast and simple micro-framework for small web-applications" |
43 |
-HOMEPAGE=" |
44 |
- https://bottlepy.org/ |
45 |
- https://github.com/bottlepy/bottle/ |
46 |
- https://pypi.org/project/bottle/ |
47 |
-" |
48 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
49 |
- |
50 |
-LICENSE="MIT" |
51 |
-SLOT="0" |
52 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" |
53 |
-IUSE="test" |
54 |
-RESTRICT="!test? ( test )" |
55 |
- |
56 |
-BDEPEND=" |
57 |
- test? ( |
58 |
- dev-python/mako[${PYTHON_USEDEP}] |
59 |
- ) |
60 |
-" |
61 |
- |
62 |
-PATCHES=( |
63 |
- "${FILESDIR}"/bottle-0.12.8-py3.5-backport.patch |
64 |
- "${FILESDIR}"/bottle-0.12.19-py311.patch |
65 |
-) |
66 |
- |
67 |
-python_prepare_all() { |
68 |
- sed -i -e '/scripts/d' setup.py || die |
69 |
- |
70 |
- # Remove test file requring connection to network |
71 |
- rm test/test_server.py || die |
72 |
- distutils-r1_python_prepare_all |
73 |
-} |
74 |
- |
75 |
-python_test() { |
76 |
- "${EPYTHON}" test/testall.py || die "tests failed under ${EPYTHON}" |
77 |
-} |
78 |
- |
79 |
-pkg_postinst() { |
80 |
- optfeature "Templating support" dev-python/mako |
81 |
- elog "Due to problems with bottle.py being in /usr/bin (see bug #474874)" |
82 |
- elog "we do as most other distros and do not install the script anymore." |
83 |
- elog "If you do want/have to call it directly rather than through your app," |
84 |
- elog "please use the following instead:" |
85 |
- elog ' `python -m bottle`' |
86 |
-} |
87 |
|
88 |
diff --git a/dev-python/bottle/files/bottle-0.12.19-py311.patch b/dev-python/bottle/files/bottle-0.12.19-py311.patch |
89 |
deleted file mode 100644 |
90 |
index c7c36c3a37ee..000000000000 |
91 |
--- a/dev-python/bottle/files/bottle-0.12.19-py311.patch |
92 |
+++ /dev/null |
93 |
@@ -1,45 +0,0 @@ |
94 |
-From 232f671fd0a28d435550afc4e2a9fde63c9e0db2 Mon Sep 17 00:00:00 2001 |
95 |
-From: Riley Banks <waultah@×××××.com> |
96 |
-Date: Sun, 11 Oct 2015 10:21:43 +0100 |
97 |
-Subject: [PATCH] Implement getargspec using inspect.Signature |
98 |
- |
99 |
---- |
100 |
- bottle.py | 20 +++++++++++++++++++- |
101 |
- 1 file changed, 19 insertions(+), 1 deletion(-) |
102 |
- |
103 |
-diff --git a/bottle.py b/bottle.py |
104 |
-index 9806efd..18ed730 100644 |
105 |
---- a/bottle.py |
106 |
-+++ b/bottle.py |
107 |
-@@ -41,9 +41,27 @@ import base64, cgi, email.utils, functools, hmac, itertools, mimetypes,\ |
108 |
- from datetime import date as datedate, datetime, timedelta |
109 |
- from tempfile import TemporaryFile |
110 |
- from traceback import format_exc, print_exc |
111 |
--from inspect import getargspec |
112 |
- from unicodedata import normalize |
113 |
- |
114 |
-+# inspect.getargspec was removed in Python 3.6, use |
115 |
-+# Signature-based version where we can (Python 3.3+) |
116 |
-+try: |
117 |
-+ from inspect import signature |
118 |
-+ def getargspec(func): |
119 |
-+ params = signature(func).parameters |
120 |
-+ args, varargs, keywords, defaults = [], None, None, [] |
121 |
-+ for name, param in params.items(): |
122 |
-+ if param.kind == param.VAR_POSITIONAL: |
123 |
-+ varargs = name |
124 |
-+ elif param.kind == param.VAR_KEYWORD: |
125 |
-+ keywords = name |
126 |
-+ else: |
127 |
-+ args.append(name) |
128 |
-+ if param.default is not param.empty: |
129 |
-+ defaults.append(param.default) |
130 |
-+ return (args, varargs, keywords, tuple(defaults) or defaults) |
131 |
-+except ImportError: |
132 |
-+ from inspect import getargspec |
133 |
- |
134 |
- try: from simplejson import dumps as json_dumps, loads as json_lds |
135 |
- except ImportError: # pragma: no cover |
136 |
--- |
137 |
-2.35.1 |
138 |
- |
139 |
|
140 |
diff --git a/dev-python/bottle/files/bottle-0.12.8-py3.5-backport.patch b/dev-python/bottle/files/bottle-0.12.8-py3.5-backport.patch |
141 |
deleted file mode 100644 |
142 |
index 86e1ac04bc41..000000000000 |
143 |
--- a/dev-python/bottle/files/bottle-0.12.8-py3.5-backport.patch |
144 |
+++ /dev/null |
145 |
@@ -1,36 +0,0 @@ |
146 |
- test/test_environ.py | 6 +++--- |
147 |
- 1 file changed, 3 insertions(+), 3 deletions(-) |
148 |
- |
149 |
-diff --git a/test/test_environ.py b/test/test_environ.py |
150 |
-old mode 100755 |
151 |
-new mode 100644 |
152 |
-index 2b8079b..2feebe3 |
153 |
---- a/test/test_environ.py |
154 |
-+++ b/test/test_environ.py |
155 |
-@@ -592,7 +592,7 @@ class TestResponse(unittest.TestCase): |
156 |
- r.set_cookie('name2', 'value', max_age=datetime.timedelta(days=1)) |
157 |
- cookies = sorted([value for name, value in r.headerlist |
158 |
- if name.title() == 'Set-Cookie']) |
159 |
-- self.assertEqual(cookies[0], 'name1=value; Max-Age=5') |
160 |
-+ self.assertEqual(cookies[0].lower(), 'name1=value; max-age=5') |
161 |
- self.assertEqual(cookies[1], 'name2=value; Max-Age=86400') |
162 |
- |
163 |
- def test_set_cookie_expires(self): |
164 |
-@@ -602,7 +602,7 @@ class TestResponse(unittest.TestCase): |
165 |
- r.set_cookie('name2', 'value', expires=datetime.datetime(1970,1,1,0,0,43)) |
166 |
- cookies = sorted([value for name, value in r.headerlist |
167 |
- if name.title() == 'Set-Cookie']) |
168 |
-- self.assertEqual(cookies[0], 'name1=value; expires=Thu, 01 Jan 1970 00:00:42 GMT') |
169 |
-+ self.assertEqual(cookies[0].lower(), 'name1=value; expires=thu, 01 jan 1970 00:00:42 gmt') |
170 |
- self.assertEqual(cookies[1], 'name2=value; expires=Thu, 01 Jan 1970 00:00:43 GMT') |
171 |
- |
172 |
- def test_delete_cookie(self): |
173 |
-@@ -611,7 +611,7 @@ class TestResponse(unittest.TestCase): |
174 |
- response.delete_cookie('name') |
175 |
- cookies = [value for name, value in response.headerlist |
176 |
- if name.title() == 'Set-Cookie'] |
177 |
-- self.assertTrue('name=;' in cookies[0]) |
178 |
-+ self.assertTrue('Max-Age=-1' in cookies[0]) |
179 |
- |
180 |
- def test_set_header(self): |
181 |
- response = BaseResponse() |