Skip to content
This repository has been archived by the owner on Dec 7, 2021. It is now read-only.

Commit

Permalink
Multiple parallel CI jobs. Codecov.
Browse files Browse the repository at this point in the history
Switching Travis and AppVeyor to multiple jobs per commit. Faster
parallelism on both (all at once in Travis, two at once in AppVeyor).

Switching from Coveralls to Codecov to cease appveyor-artifacts
crazyness with the Travis job waiting for the AppVeyor job.

Bumping lint/test dependency versions.

Fixing git clone command in documentation. Using HTTPS instead of SSH to
avoid auth issues.
  • Loading branch information
Robpol86 committed Oct 16, 2016
1 parent 286ec1e commit 6a989ec
Show file tree
Hide file tree
Showing 5 changed files with 65 additions and 52 deletions.
45 changes: 30 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,38 @@
# Configure.
env: TOX_ENV=py
language: python
python: 3.5
matrix:
include:
- python: 3.5
env: TOX_ENV=lint
after_success:
- echo
- python: 3.5
env: TOX_ENV=docs
after_success:
- eval "$(ssh-agent -s)"; touch docs/key; chmod 0600 docs/key
- openssl aes-256-cbc -d -K "$encrypted_c89fed6a587d_key" -iv "$encrypted_c89fed6a587d_iv"
< docs/key.enc > docs/key && ssh-add docs/key
- git config --global user.email "[email protected]"
- git config --global user.name "Travis CI"
- git remote set-url --push origin "[email protected]:$TRAVIS_REPO_SLUG"
- export ${!TRAVIS*}
- tox -e docsV
python:
- 3.5
- 3.4
- 3.3
- pypy3
- pypy
- 2.7
- 2.6
sudo: false

# Run.
install: pip install appveyor-artifacts coveralls tox
script: tox -e lint,py35,py34,py33,pypy3,pypy,py27,py26,docs
install: pip install tox
script: tox -e $TOX_ENV
after_success:
- mv .coverage .coverage.travis
- appveyor-artifacts -mi download
- coverage combine
- coveralls
- eval "$(ssh-agent -s)"; touch docs/key; chmod 0600 docs/key
- openssl aes-256-cbc -d -K "$encrypted_c89fed6a587d_key" -iv "$encrypted_c89fed6a587d_iv" < docs/key.enc > docs/key
&& ssh-add docs/key
- git config --global user.email "[email protected]"
- git config --global user.name "Travis CI"
- git remote set-url origin "[email protected]:$TRAVIS_REPO_SLUG"
- export ${!TRAVIS*}
- tox -e docsV
- bash <(curl -s https://codecov.io/bash)

# Deploy.
deploy:
Expand All @@ -30,4 +44,5 @@ deploy:
7ua6nNpYPhjRv7j5YM4uLlK+4Fv/iU+iQcVfy89BS4vlXzUoje6nLIhogsxytb+FjdGZ0PK\
JzzxfYr0relUjui/gPYmTQoZ1IiT8A="
on:
condition: $TRAVIS_PYTHON_VERSION = 3.4
tags: true
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ Easily draw tables in terminal/console applications from a list of lists of stri
:target: https://travis-ci.org/Robpol86/terminaltables
:alt: Build Status

.. image:: https://img.shields.io/coveralls/Robpol86/terminaltables/master.svg?style=flat-square&label=Coveralls
:target: https://coveralls.io/github/Robpol86/terminaltables
.. image:: https://img.shields.io/codecov/c/github/Robpol86/terminaltables/master.svg?style=flat-square&label=Codecov
:target: https://codecov.io/gh/Robpol86/terminaltables
:alt: Coverage Status

.. image:: https://img.shields.io/pypi/v/terminaltables.svg?style=flat-square&label=Latest
Expand Down
23 changes: 19 additions & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,29 @@
# Configure.
artifacts:
- path: .coverage
environment:
PYTHON: Python35
matrix:
- TOX_ENV: lint
- TOX_ENV: py35
- TOX_ENV: py34
- TOX_ENV: py33
- TOX_ENV: py27
- TOX_ENV: py
PYTHON: Python35-x64
- TOX_ENV: py
PYTHON: Python34-x64
- TOX_ENV: py
PYTHON: Python33-x64
- TOX_ENV: py
PYTHON: Python27-x64

# Run.
init: set PATH=C:\Python35-x64;C:\Python35-x64\Scripts;%PATH%
init: set PATH=C:\%PYTHON%;C:\%PYTHON%\Scripts;%PATH%
install:
- appveyor DownloadFile https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-desktop.ps1
- ps: .\enable-desktop
build_script: pip install tox
test_script: tox -e lint,py35,py34,py33,py27,py26,py35x64,py34x64,py33x64,py27x64,py26x64
test_script: tox -e %TOX_ENV%
on_success: IF %TOX_ENV% NEQ lint pip install codecov & codecov

# Post.
# on_finish: https://github.com/Robpol86/terminaltables/issues/30
Expand Down
2 changes: 1 addition & 1 deletion docs/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ Lastly you can also just clone the repo and install from it. Usually you only ne

.. code-block:: bash
git clone git@github.com:Robpol86/terminaltables.git
git clone https://github.com/Robpol86/terminaltables.git
cd terminaltables
python setup.py install
43 changes: 13 additions & 30 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,66 +7,49 @@ envlist = lint,py{34,27,26}
[testenv]
commands =
python -c "import os, sys; sys.platform == 'win32' and os.system('easy_install pillow')"
py.test --cov-append --cov-report term-missing --cov-report xml --cov {[general]name} --cov-config tox.ini \
{posargs:tests}
py.test --cov-report term-missing --cov-report xml --cov {[general]name} --cov-config tox.ini {posargs:tests}
deps =
colorama==0.3.7
colorclass==2.2.0
pytest-cov==2.3.1
pytest-cov==2.4.0
termcolor==1.1.0
passenv =
WINDIR
setenv =
PYTHON_EGG_CACHE = {envtmpdir}
usedevelop = True

[testenv:py35x64]
basepython = C:\Python35-x64\python.exe

[testenv:py34x64]
basepython = C:\Python34-x64\python.exe

[testenv:py33x64]
basepython = C:\Python33-x64\python.exe

[testenv:py27x64]
basepython = C:\Python27-x64\python.exe

[testenv:py26x64]
basepython = C:\Python26-x64\python.exe

[testenv:lint]
commands =
coverage erase
python setup.py check --strict
python setup.py check --strict -m
python setup.py check --strict -s
python setup.py check_version
flake8 --application-import-names={[general]name},tests
pylint --rcfile=tox.ini setup.py {[general]name}
deps =
coverage==4.2
flake8-docstrings==1.0.2
flake8-import-order==0.9.1
flake8==3.0.3
flake8-import-order==0.9.2
flake8==3.0.4
pep8-naming==0.4.1
pylint==1.6.4

[testenv:docs]
changedir = {toxinidir}/docs
commands =
sphinx-build -a -E . _build/html
sphinx-build . _build/html {posargs}
deps =
sphinx==1.4.5
robpol86-sphinxcontrib-googleanalytics==0.1
sphinx-rtd-theme==0.1.10a0
sphinxcontrib-googleanalytics==0.1
sphinx==1.4.8
usedevelop = False

[testenv:docsV]
commands =
sphinx-versioning push docs gh-pages .
deps =
{[testenv:docs]deps}
sphinxcontrib-versioning==2.1.0
sphinxcontrib-versioning==2.2.0
passenv =
HOME
HOSTNAME
Expand All @@ -81,14 +64,14 @@ max-line-length = 120
statistics = True

[pylint]
ignore = .tox/*,build/*,docs/*,env/*,get-pip.py
max-args = 6
max-line-length = 120
reports = no
disable =
locally-disabled,
too-few-public-methods,
too-many-instance-attributes,
ignore = .tox/*,build/*,docs/*,env/*,get-pip.py
max-args = 6
max-line-length = 120
reports = no

[run]
branch = True

0 comments on commit 6a989ec

Please sign in to comment.