Skip to content

Commit

Permalink
tox/ci: remove testing with pytest's features branch
Browse files Browse the repository at this point in the history
pytest is using the master branch now only.
  • Loading branch information
blueyed committed Feb 22, 2020
1 parent 6fd5b56 commit 136663a
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 5 deletions.
1 change: 0 additions & 1 deletion .appveyor.yml
Expand Up @@ -7,7 +7,6 @@ environment:
- TOXENV: "py37-pytestlatest"
- TOXENV: "py38-pytestlatest"
- TOXENV: "py38-pytestmaster"
- TOXENV: "py38-pytestfeatures"

install:
- C:\Python38\python -m pip install -U pip setuptools virtualenv
Expand Down
2 changes: 0 additions & 2 deletions .travis.yml
Expand Up @@ -46,8 +46,6 @@ jobs:
env: TOXENV=py37-pytestlatest
- python: "3.8"
env: TOXENV=py38-pytestmaster
- python: "3.8"
env: TOXENV=py38-pytestfeatures

- stage: deploy
python: '3.8'
Expand Down
3 changes: 1 addition & 2 deletions tox.ini
Expand Up @@ -2,15 +2,14 @@
envlist=
linting
py{27,34,35,36,37,38}-pytestlatest
py38-pytest{master,features}
py38-pytestmaster

[testenv]
passenv = USER USERNAME
extras = testing
deps =
pytestlatest: pytest
pytestmaster: git+https://github.com/pytest-dev/pytest.git@master
pytestfeatures: git+https://github.com/pytest-dev/pytest.git@features
commands=
pytest {posargs}

Expand Down

0 comments on commit 136663a

Please sign in to comment.