1 |
commit: 657ae90668b15067cb6574f5ab65feed3c2aaee8 |
2 |
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Aug 21 12:52:08 2021 +0000 |
4 |
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Aug 21 13:03:09 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=657ae906 |
7 |
|
8 |
dev-python/zconfig: drop 3.5.0 |
9 |
|
10 |
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> |
11 |
|
12 |
dev-python/zconfig/Manifest | 1 - |
13 |
dev-python/zconfig/files/zconfig-3.5.0-py38.patch | 105 ---------------------- |
14 |
dev-python/zconfig/zconfig-3.5.0.ebuild | 36 -------- |
15 |
3 files changed, 142 deletions(-) |
16 |
|
17 |
diff --git a/dev-python/zconfig/Manifest b/dev-python/zconfig/Manifest |
18 |
index 4d6e43cc55e..abea87d5c76 100644 |
19 |
--- a/dev-python/zconfig/Manifest |
20 |
+++ b/dev-python/zconfig/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
-DIST ZConfig-3.5.0.tar.gz 127317 BLAKE2B 735d554072d4be4ee0552151a6bd0401e66bc0a7a091d97656a2c95efb13580d264a39e28c11e096ee77f57bc96d684720c22c981f5dbd82ce012d40c94d33ea SHA512 14af4de2adcb7e5404a4fd8e1a1903758c584898fda7c4d2a660616c37023f0e0b5d4acac789a930c2900eb501528899d51c4ea4c4050535cfbaa629e9159558 |
23 |
DIST ZConfig-3.6.0.tar.gz 134559 BLAKE2B cf24d055a88c552311e5837b0caba143a9d4122caa0319ad31de89177d521ecb3f8fb7f463618f35410cc25169865103ff5957e9484e347ebd7e1b7cacb20b35 SHA512 a5cca99f324007a14f4738be1c9f7424538d8a13f7171fbfa979ce9273b29679eb18b0e905afc96d38abcf042af222e3e86acad6912b9eb8b71b6c8122c47031 |
24 |
|
25 |
diff --git a/dev-python/zconfig/files/zconfig-3.5.0-py38.patch b/dev-python/zconfig/files/zconfig-3.5.0-py38.patch |
26 |
deleted file mode 100644 |
27 |
index ea5e8db7642..00000000000 |
28 |
--- a/dev-python/zconfig/files/zconfig-3.5.0-py38.patch |
29 |
+++ /dev/null |
30 |
@@ -1,105 +0,0 @@ |
31 |
-Required for python 3.8+ compatibility |
32 |
-https://github.com/zopefoundation/ZConfig/pull/70 |
33 |
---- a/ZConfig/components/logger/formatter.py |
34 |
-+++ b/ZConfig/components/logger/formatter.py |
35 |
-@@ -248,8 +248,17 @@ def __call__(self): |
36 |
- else: |
37 |
- # A formatter class that supports style, but our style is |
38 |
- # non-standard, so we reach under the covers a bit. |
39 |
-+ # |
40 |
-+ # Python 3.8 adds a validate option, defaulting to True, |
41 |
-+ # which cases the format string to be checked. Since |
42 |
-+ # safe-template is not a standard style, we want to |
43 |
-+ # suppress this. |
44 |
-+ # |
45 |
-+ kwargs = dict() |
46 |
-+ if sys.version_info >= (3, 8): |
47 |
-+ kwargs['validate'] = False |
48 |
- formatter = self.factory(self.format, self.dateformat, |
49 |
-- style='$') |
50 |
-+ style='$', **kwargs) |
51 |
- assert formatter._style._fmt == self.format |
52 |
- formatter._style = stylist |
53 |
- else: |
54 |
---- a/ZConfig/components/logger/tests/test_formatter.py |
55 |
-+++ b/ZConfig/components/logger/tests/test_formatter.py |
56 |
-@@ -25,6 +25,17 @@ |
57 |
- import ZConfig.components.logger.tests.support |
58 |
- |
59 |
- |
60 |
-+# In Python 3.8, a KeyError raised by string interpolation is re-written |
61 |
-+# into a ValueError reporting a reference to an undefined field. We're |
62 |
-+# not masking the exception, but we want to check for the right one in |
63 |
-+# the tests below (without catching anything else). |
64 |
-+# |
65 |
-+if sys.version_info >= (3, 8): |
66 |
-+ MissingFieldError = ValueError |
67 |
-+else: |
68 |
-+ MissingFieldError = KeyError |
69 |
-+ |
70 |
-+ |
71 |
- class LogFormatStyleTestCase(unittest.TestCase): |
72 |
- |
73 |
- def setUp(self): |
74 |
-@@ -314,7 +325,10 @@ class CustomFormatterFactoryWithoutStyleParamTestCase( |
75 |
- class StylelessFormatter(logging.Formatter): |
76 |
- |
77 |
- def __init__(self, fmt=None, datefmt=None): |
78 |
-- logging.Formatter.__init__(self, fmt=fmt, datefmt=datefmt) |
79 |
-+ kwargs = dict() |
80 |
-+ if sys.version_info >= (3, 8): |
81 |
-+ kwargs['validate'] = False |
82 |
-+ logging.Formatter.__init__(self, fmt=fmt, datefmt=datefmt, **kwargs) |
83 |
- |
84 |
- |
85 |
- def styleless_formatter(fmt=None, datefmt=None): |
86 |
-@@ -552,9 +566,9 @@ def test_classic_arbitrary_field_missing(self): |
87 |
- arbitrary_fields=True) |
88 |
- |
89 |
- # The formatter still breaks when it references an undefined field: |
90 |
-- with self.assertRaises(KeyError) as cm: |
91 |
-+ with self.assertRaises(MissingFieldError) as cm: |
92 |
- formatter.format(self.record) |
93 |
-- self.assertEqual(str(cm.exception), "'undefined_field'") |
94 |
-+ self.assertIn("'undefined_field'", str(cm.exception)) |
95 |
- |
96 |
- def test_classic_arbitrary_field_present(self): |
97 |
- formatter = self.get_formatter( |
98 |
-@@ -574,9 +588,9 @@ def test_format_arbitrary_field_missing(self): |
99 |
- arbitrary_fields=True) |
100 |
- |
101 |
- # The formatter still breaks when it references an undefined field: |
102 |
-- with self.assertRaises(KeyError) as cm: |
103 |
-+ with self.assertRaises(MissingFieldError) as cm: |
104 |
- formatter.format(self.record) |
105 |
-- self.assertEqual(str(cm.exception), "'undefined_field'") |
106 |
-+ self.assertIn("'undefined_field'", str(cm.exception)) |
107 |
- |
108 |
- def test_format_arbitrary_field_present(self): |
109 |
- formatter = self.get_formatter( |
110 |
-@@ -596,9 +610,9 @@ def test_template_arbitrary_field_missing(self): |
111 |
- arbitrary_fields=True) |
112 |
- |
113 |
- # The formatter still breaks when it references an undefined field: |
114 |
-- with self.assertRaises(KeyError) as cm: |
115 |
-+ with self.assertRaises(MissingFieldError) as cm: |
116 |
- formatter.format(self.record) |
117 |
-- self.assertEqual(str(cm.exception), "'undefined_field'") |
118 |
-+ self.assertIn("'undefined_field'", str(cm.exception)) |
119 |
- |
120 |
- def test_template_arbitrary_field_present(self): |
121 |
- formatter = self.get_formatter( |
122 |
- |
123 |
---- a/ZConfig/components/logger/formatter.py |
124 |
-+++ b/ZConfig/components/logger/formatter.py |
125 |
-@@ -250,7 +250,7 @@ def __call__(self): |
126 |
- # non-standard, so we reach under the covers a bit. |
127 |
- # |
128 |
- # Python 3.8 adds a validate option, defaulting to True, |
129 |
-- # which cases the format string to be checked. Since |
130 |
-+ # which causes the format string to be checked. Since |
131 |
- # safe-template is not a standard style, we want to |
132 |
- # suppress this. |
133 |
- # |
134 |
- |
135 |
- |
136 |
|
137 |
diff --git a/dev-python/zconfig/zconfig-3.5.0.ebuild b/dev-python/zconfig/zconfig-3.5.0.ebuild |
138 |
deleted file mode 100644 |
139 |
index 174067f20aa..00000000000 |
140 |
--- a/dev-python/zconfig/zconfig-3.5.0.ebuild |
141 |
+++ /dev/null |
142 |
@@ -1,36 +0,0 @@ |
143 |
-# Copyright 1999-2021 Gentoo Authors |
144 |
-# Distributed under the terms of the GNU General Public License v2 |
145 |
- |
146 |
-EAPI=7 |
147 |
- |
148 |
-DISTUTILS_USE_SETUPTOOLS=rdepend |
149 |
-PYTHON_COMPAT=( python3_{7..9} ) |
150 |
-inherit distutils-r1 |
151 |
- |
152 |
-MY_PN="ZConfig" |
153 |
-MY_P="${MY_PN}-${PV}" |
154 |
- |
155 |
-DESCRIPTION="A configuration library supporting a hierarchical schema-driven configuration model" |
156 |
-HOMEPAGE="https://pypi.org/project/ZConfig/" |
157 |
-S="${WORKDIR}/${MY_P}" |
158 |
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" |
159 |
- |
160 |
-LICENSE="ZPL" |
161 |
-SLOT="0" |
162 |
-KEYWORDS="~amd64" |
163 |
- |
164 |
-BDEPEND=" |
165 |
- test? ( |
166 |
- dev-python/docutils[${PYTHON_USEDEP}] |
167 |
- dev-python/manuel[${PYTHON_USEDEP}] |
168 |
- dev-python/zope-exceptions[${PYTHON_USEDEP}] |
169 |
- dev-python/zope-interface[${PYTHON_USEDEP}] |
170 |
- dev-python/zope-testrunner[${PYTHON_USEDEP}] |
171 |
- )" |
172 |
- |
173 |
-DOCS=( CHANGES.rst README.rst ) |
174 |
- |
175 |
-PATCHES=( "${FILESDIR}"/${P}-py38.patch ) |
176 |
- |
177 |
-distutils_enable_tests nose |
178 |
-distutils_enable_sphinx doc dev-python/sphinxcontrib-programoutput |