🌐 AI搜索 & 代理 主页
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ install:
- activate test-environment
- echo %PYTHON_VERSION% %TARGET_ARCH%
# pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124
- pip install -q "pytest!=3.3.0,>=3.2.0" "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout pytest-xdist
- pip install -q "pytest!=3.3.0,>=3.2.0,<3.8" "pytest-cov>=2.3.1"
pytest-rerunfailures pytest-timeout pytest-xdist

# Apply patch to `subprocess` on Python versions > 2 and < 3.6.3
# https://github.com/matplotlib/matplotlib/issues/9176
Expand Down
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,9 @@ env:
- PYPARSING=pyparsing
# pytest-timeout master depends on pytest>=3.6. Testing with pytest 3.1 is
# still supported; this is tested by the first matrix entry.
- PYTEST='pytest>=3.6'
- PYTEST='pytest>=3.6,<3.8'
- PYTEST_COV=pytest-cov
- PYTEST_RERUNFAILURES=pytest-rerunfailures
- PYTEST_PEP8=
- PYTEST_TIMEOUT=pytest-timeout
- SPHINX=sphinx
Expand All @@ -82,6 +83,7 @@ matrix:
- PYTEST=pytest==3.1.0
- PYTEST_COV=pytest-cov==2.3.1
- PYTEST_TIMEOUT=pytest-timeout==1.2.1 # Newer pytest-timeouts don't support pytest <3.4.
- PYTEST_RERUNFAILURES='pytest-rerunfailures<5' # 5 needs pytest>=3.6
- SPHINX=sphinx==1.3
- python: 3.4
env: PYTHON_ARGS=-OO
Expand Down Expand Up @@ -177,7 +179,7 @@ install:
$PYTEST_COV \
pytest-faulthandler \
$PYTEST_PEP8 \
pytest-rerunfailures \
$PYTEST_RERUNFAILURES \
$PYTEST_TIMEOUT \
pytest-xdist

Expand Down