Merge pull request #4380 from blueyed/improve-ci

Travis: move faster builds to baseline
This commit is contained in:
Daniel Hahler 2018-11-13 12:40:26 +01:00 committed by GitHub
commit 46c8363e12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions

View File

@ -13,14 +13,13 @@ install:
- pip install --upgrade --pre tox - pip install --upgrade --pre tox
env: env:
matrix: matrix:
- TOXENV=py27
# Specialized factors for py27. # Specialized factors for py27.
- TOXENV=py27-pexpect,py27-trial,py27-numpy
- TOXENV=py27-nobyte - TOXENV=py27-nobyte
- TOXENV=py27-xdist - TOXENV=py27-xdist
- TOXENV=py27-pluggymaster PYTEST_NO_COVERAGE=1 - TOXENV=py27-pluggymaster PYTEST_NO_COVERAGE=1
# Specialized factors for py37. # Specialized factors for py37.
- TOXENV=py37-pexpect,py37-trial,py37-numpy - TOXENV=py37-pexpect,py37-trial,py37-numpy
- TOXENV=py37-xdist
- TOXENV=py37-pluggymaster PYTEST_NO_COVERAGE=1 - TOXENV=py37-pluggymaster PYTEST_NO_COVERAGE=1
- TOXENV=py37-freeze PYTEST_NO_COVERAGE=1 - TOXENV=py37-freeze PYTEST_NO_COVERAGE=1
@ -30,8 +29,12 @@ jobs:
- env: TOXENV=pypy PYTEST_NO_COVERAGE=1 - env: TOXENV=pypy PYTEST_NO_COVERAGE=1
python: 'pypy-5.4' python: 'pypy-5.4'
dist: trusty dist: trusty
- env: TOXENV=py34
python: '3.4'
- env: TOXENV=py35 - env: TOXENV=py35
python: '3.5' python: '3.5'
- env: TOXENV=py36
python: '3.6'
- env: TOXENV=py37 - env: TOXENV=py37
- &test-macos - &test-macos
language: generic language: generic
@ -50,11 +53,8 @@ jobs:
- brew link python - brew link python
- stage: baseline - stage: baseline
env: TOXENV=py27 env: TOXENV=py27-pexpect,py27-trial,py27-numpy
- env: TOXENV=py34 - env: TOXENV=py37-xdist
python: '3.4'
- env: TOXENV=py36
python: '3.6'
- env: TOXENV=linting,docs,doctesting - env: TOXENV=linting,docs,doctesting
python: '3.7' python: '3.7'

View File

@ -1,5 +1,7 @@
environment: environment:
matrix: matrix:
- TOXENV: "py37-xdist"
- TOXENV: "py27-xdist"
- TOXENV: "py27" - TOXENV: "py27"
- TOXENV: "py37" - TOXENV: "py37"
- TOXENV: "linting,docs,doctesting" - TOXENV: "linting,docs,doctesting"
@ -12,14 +14,12 @@ environment:
- TOXENV: "py27-trial,py27-numpy,py27-nobyte" - TOXENV: "py27-trial,py27-numpy,py27-nobyte"
- TOXENV: "py27-pluggymaster" - TOXENV: "py27-pluggymaster"
PYTEST_NO_COVERAGE: "1" PYTEST_NO_COVERAGE: "1"
- TOXENV: "py27-xdist"
# Specialized factors for py37. # Specialized factors for py37.
- TOXENV: "py37-trial,py37-numpy" - TOXENV: "py37-trial,py37-numpy"
- TOXENV: "py37-pluggymaster" - TOXENV: "py37-pluggymaster"
PYTEST_NO_COVERAGE: "1" PYTEST_NO_COVERAGE: "1"
- TOXENV: "py37-freeze" - TOXENV: "py37-freeze"
PYTEST_NO_COVERAGE: "1" PYTEST_NO_COVERAGE: "1"
- TOXENV: "py37-xdist"
matrix: matrix:
fast_finish: true fast_finish: true