Commit 0ec9be57 authored by Stefan Behnel's avatar Stefan Behnel

Merge branch '0.29.x'

parents 9a761a63 d21f970f
...@@ -102,7 +102,6 @@ matrix: ...@@ -102,7 +102,6 @@ matrix:
- env: BACKEND=c EXCLUDE="--listfile=tests/pypy_bugs.txt bugs" - env: BACKEND=c EXCLUDE="--listfile=tests/pypy_bugs.txt bugs"
- env: BACKEND=c EXCLUDE="--listfile=tests/pypy_bugs.txt --listfile=tests/pypy2_bugs.txt bugs" - env: BACKEND=c EXCLUDE="--listfile=tests/pypy_bugs.txt --listfile=tests/pypy2_bugs.txt bugs"
before_install: before_install:
- | - |
if [ "$TRAVIS_OS_NAME" == "linux" ]; then if [ "$TRAVIS_OS_NAME" == "linux" ]; then
......
...@@ -88,6 +88,7 @@ branches: ...@@ -88,6 +88,7 @@ branches:
only: only:
- master - master
- release - release
- 0.29.x
init: init:
- "ECHO Python %PYTHON_VERSION% (%PYTHON_ARCH%bit) from %PYTHON%" - "ECHO Python %PYTHON_VERSION% (%PYTHON_ARCH%bit) from %PYTHON%"
......
...@@ -13,11 +13,16 @@ import pickle ...@@ -13,11 +13,16 @@ import pickle
import weakref import weakref
import errno import errno
from test.support import (TESTFN, captured_stderr, check_impl_detail, from test.support import (captured_stderr, check_impl_detail, gc_collect,
check_warnings, gc_collect,
# no_tracing, cpython_only, # no_tracing, cpython_only,
unlink, import_module, script_helper, script_helper, SuppressCrashReport)
SuppressCrashReport) try:
from test.support.os_helper import TESTFN, unlink
from test.support.warnings_helper import check_warnings
from test.support.import_helper import import_module
except ImportError:
# Python 3.9 and older
from test.support import check_warnings
no_tracing = unittest.skip("For nested functions, Cython generates a C call without recursion checks.") no_tracing = unittest.skip("For nested functions, Cython generates a C call without recursion checks.")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment