Skip to content

Commit 136663a

Browse files
committed
tox/ci: remove testing with pytest's features branch
pytest is using the master branch now only.
1 parent 6fd5b56 commit 136663a

File tree

3 files changed

+1
-5
lines changed

3 files changed

+1
-5
lines changed

.appveyor.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ environment:
77
- TOXENV: "py37-pytestlatest"
88
- TOXENV: "py38-pytestlatest"
99
- TOXENV: "py38-pytestmaster"
10-
- TOXENV: "py38-pytestfeatures"
1110

1211
install:
1312
- C:\Python38\python -m pip install -U pip setuptools virtualenv

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ jobs:
4646
env: TOXENV=py37-pytestlatest
4747
- python: "3.8"
4848
env: TOXENV=py38-pytestmaster
49-
- python: "3.8"
50-
env: TOXENV=py38-pytestfeatures
5149

5250
- stage: deploy
5351
python: '3.8'

tox.ini

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22
envlist=
33
linting
44
py{27,34,35,36,37,38}-pytestlatest
5-
py38-pytest{master,features}
5+
py38-pytestmaster
66

77
[testenv]
88
passenv = USER USERNAME
99
extras = testing
1010
deps =
1111
pytestlatest: pytest
1212
pytestmaster: git+https://github.com/pytest-dev/pytest.git@master
13-
pytestfeatures: git+https://github.com/pytest-dev/pytest.git@features
1413
commands=
1514
pytest {posargs}
1615

0 commit comments

Comments
 (0)