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
6 changes: 1 addition & 5 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
environment:
global:
PATH: "C:\\Python27\\Scripts\\;%PATH%"
PYTEST_COMMAND: "coverage run -m pytest"
matrix:
- TOXENV: py27-base
- TOXENV: py27-optional
Expand All @@ -17,7 +16,7 @@ environment:

install:
- git submodule update --init --recursive
- python -m pip install tox codecov
- python -m pip install tox

build: off

Expand All @@ -26,6 +25,3 @@ test_script:

after_test:
- python debug-info.py

on_success:
- codecov
6 changes: 1 addition & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,13 @@ cache: pip

env:
global:
- PYTEST_COMMAND="coverage run -m pytest"
- TOXENV=base,optional,six19-optional

install:
- pip install tox codecov
- pip install tox

script:
- tox

after_script:
- python debug-info.py

after_success:
- codecov
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ deps =
doc: Sphinx

passenv =
PYTEST_COMMAND
PYTEST_COMMAND # this is maintained so one can, e.g., PYTEST_COMMAND="coverage run -m pytest"
COVERAGE_RUN_OPTIONS
commands =
six19: pip install six==1.9
Expand Down