|
5 | 5 | def is_slim:
|
6 | 6 | env.variant | startswith("slim-")
|
7 | 7 | ;
|
| 8 | + def is_bullseye: |
| 9 | + env.variant | contains("bullseye") |
| 10 | + ; |
8 | 11 | def rcVersion:
|
9 | 12 | env.version | rtrimstr("-rc")
|
10 | 13 | -}}
|
@@ -191,19 +194,46 @@ RUN set -eux; \
|
191 | 194 | {{ ) end -}}
|
192 | 195 | {{ if is_slim or is_alpine then ( -}}
|
193 | 196 | LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \
|
| 197 | +{{ ) else "" end -}} |
| 198 | +{{ if ([ "3.13" ] | index(rcVersion)) and (is_alpine or is_bullseye) then ( -}} |
| 199 | +# Workaround https://github.com/python/cpython/issues/125067 |
| 200 | + printf '%s\n' \ |
| 201 | + "diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py" \ |
| 202 | + "index ebec9d8f18a..385735c1e18 100644" \ |
| 203 | + "--- a/Lib/test/test_xml_etree.py" \ |
| 204 | + "+++ b/Lib/test/test_xml_etree.py" \ |
| 205 | + "@@ -1504,9 +1504,11 @@ def test_simple_xml(self, chunk_size=None, flush=False):" \ |
| 206 | + " self.assert_event_tags(parser, [('end', 'root')])" \ |
| 207 | + " self.assertIsNone(parser.close())" \ |
| 208 | + "" \ |
| 209 | + "+ @unittest.skip('Work around: https://github.com/python/cpython/issues/125067')" \ |
| 210 | + " def test_simple_xml_chunk_1(self):" \ |
| 211 | + " self.test_simple_xml(chunk_size=1, flush=True)" \ |
| 212 | + "" \ |
| 213 | + "+ @unittest.skip('Work around: https://github.com/python/cpython/issues/125067')" \ |
| 214 | + " def test_simple_xml_chunk_5(self):" \ |
| 215 | + " self.test_simple_xml(chunk_size=5, flush=True)" \ |
| 216 | + "" \ |
| 217 | + "@@ -1731,6 +1733,7 @@ def test_flush_reparse_deferral_enabled(self):" \ |
| 218 | + "" \ |
| 219 | + " self.assert_event_tags(parser, [('end', 'doc')])" \ |
| 220 | + "" \ |
| 221 | + "+ @unittest.skip('Work around: https://github.com/python/cpython/issues/125067')" \ |
| 222 | + " def test_flush_reparse_deferral_disabled(self):" \ |
| 223 | + " parser = ET.XMLPullParser(events=('start', 'end'))" > /tmp/python-3.13-libexpat-workaround.patch ; \ |
| 224 | + patch -p1 </tmp/python-3.13-libexpat-workaround.patch ; \ |
| 225 | + \ |
194 | 226 | {{ ) else "" end -}}
|
195 | 227 | make -j "$nproc" \
|
196 | 228 | "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
|
197 | 229 | "LDFLAGS=${LDFLAGS:-}" \
|
198 |
| - "PROFILE_TASK=${PROFILE_TASK:-}" \ |
199 | 230 | ; \
|
200 | 231 | # https://github.com/docker-library/python/issues/784
|
201 | 232 | # prevent accidental usage of a system installed libpython of the same version
|
202 | 233 | rm python; \
|
203 | 234 | make -j "$nproc" \
|
204 | 235 | "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
|
205 | 236 | "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \
|
206 |
| - "PROFILE_TASK=${PROFILE_TASK:-}" \ |
207 | 237 | python \
|
208 | 238 | ; \
|
209 | 239 | make install; \
|
|
0 commit comments