Skip to content

Commit 1108eea

Browse files
committed
Revert "Require pytest>=3.8"
This reverts commit 2a5277b.
1 parent 2a5277b commit 1108eea

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dist: trusty
66
env:
77
global:
88
# used by ci-helpers
9-
- DEPS="pytest>=3.8 tox coveralls six"
9+
- DEPS="pytest tox coveralls six"
1010
- MINICONDA_VERSION=latest
1111
- DISPLAY=":99.0"
1212

appveyor.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,45 +13,45 @@ environment:
1313
matrix:
1414
- PYTHON_VERSION: "2.7"
1515
PYTEST_QT_API: "pyqt4"
16-
CONDA_DEPENDENCIES: "pytest>=3.8 pyqt=4.*"
16+
CONDA_DEPENDENCIES: "pytest pyqt=4.*"
1717
- PYTHON_VERSION: "2.7"
1818
PYTEST_QT_API: "pyqt4v2"
19-
CONDA_DEPENDENCIES: "pytest>=3.8 pyqt=4.*"
19+
CONDA_DEPENDENCIES: "pytest pyqt=4.*"
2020
- PYTHON_VERSION: "2.7"
2121
PYTEST_QT_API: "pyside"
22-
CONDA_DEPENDENCIES: "pytest>=3.8 pyside=1.*"
22+
CONDA_DEPENDENCIES: "pytest pyside=1.*"
2323

2424
- PYTHON_VERSION: "3.4"
2525
PYTEST_QT_API: "pyqt4"
26-
CONDA_DEPENDENCIES: "pytest>=3.8 pyqt=4.*"
26+
CONDA_DEPENDENCIES: "pytest pyqt=4.*"
2727
- PYTHON_VERSION: "3.4"
2828
PYTEST_QT_API: "pyqt4v2"
29-
CONDA_DEPENDENCIES: "pytest>=3.8 pyqt=4.*"
29+
CONDA_DEPENDENCIES: "pytest pyqt=4.*"
3030
- PYTHON_VERSION: "3.4"
3131
PYTEST_QT_API: "pyside"
32-
CONDA_DEPENDENCIES: "pytest>=3.8 pyside=1.*"
32+
CONDA_DEPENDENCIES: "pytest pyside=1.*"
3333

3434
- PYTHON_VERSION: "3.5"
3535
PYTEST_QT_API: "pyqt5"
36-
CONDA_DEPENDENCIES: "pytest>=3.8 pyqt=5.*"
36+
CONDA_DEPENDENCIES: "pytest pyqt=5.*"
3737
- PYTHON_VERSION: "3.5"
3838
PYTEST_QT_API: "pyside2"
39-
CONDA_DEPENDENCIES: "pytest>=3.8 pyside2=2.*"
39+
CONDA_DEPENDENCIES: "pytest pyside2=2.*"
4040

4141
- PYTHON_VERSION: "3.6"
4242
PYTEST_QT_API: "pyqt5"
43-
CONDA_DEPENDENCIES: "pytest>=3.8 pyqt=5.*"
43+
CONDA_DEPENDENCIES: "pytest pyqt=5.*"
4444
- PYTHON_VERSION: "3.6"
4545
PYTEST_QT_API: "pyside2"
46-
CONDA_DEPENDENCIES: "pytest>=3.8 pyside2=2.*"
46+
CONDA_DEPENDENCIES: "pytest pyside2=2.*"
4747

4848
matrix:
4949
exclude:
5050
# PySide2 crashes: #202
5151
- PYTEST_QT_API: "pyside2"
5252

5353
platform:
54-
- x64
54+
-x64
5555

5656
install:
5757
# If there is a newer build queued for the same PR, cancel this one.
@@ -70,7 +70,7 @@ install:
7070
- "pip install -e ."
7171

7272
# Not a .NET project, we build in the install step instead
73-
build: off
73+
build: false
7474

7575
test_script:
7676
- "%CMD_IN_ENV% python -m pytest -v tests/"

0 commit comments

Comments
 (0)