From: Isaac Jurado Date: Sun, 11 Oct 2015 12:20:01 +0000 (+0200) Subject: travis: Add new environments that install cdecimal X-Git-Tag: dev-2a51c9b95d06~2^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d177d5eb746693e0e7bb861ece87a4824008c649;p=thirdparty%2Fbabel.git travis: Add new environments that install cdecimal For the next change, we will need alternate environments for Python 2.6 and 2.7 where the cdecimal module can be installed and tested. This commit adds new environments to Tox and Travis to automate the process. --- diff --git a/.travis.yml b/.travis.yml index c7a79b1b..d25ad5f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,16 @@ matrix: include: - os: linux python: 2.6 + - os: linux + python: 2.6 + env: + - CDECIMAL=cdecimal - os: linux python: 2.7 + - os: linux + python: 2.7 + env: + - CDECIMAL=cdecimal - os: linux python: pypy - os: linux @@ -25,12 +33,26 @@ matrix: - PYTHON_VERSION=2.6.6 - PYENV_ROOT=~/.pyenv - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin + - os: osx + language: generic + env: + - PYTHON_VERSION=2.6.6 + - PYENV_ROOT=~/.pyenv + - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin + - CDECIMAL=cdecimal + - os: osx + language: generic + env: + - PYTHON_VERSION=2.7.10 + - PYENV_ROOT=~/.pyenv + - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin - os: osx language: generic env: - PYTHON_VERSION=2.7.10 - PYENV_ROOT=~/.pyenv - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin + - CDECIMAL=cdecimal - os: osx language: generic env: @@ -53,7 +75,7 @@ matrix: install: - bash .ci/deps.${TRAVIS_OS_NAME}.sh - pip install --upgrade pip - - pip install pytest pytest-cov + - pip install --allow-external cdecimal pytest pytest-cov $CDECIMAL - pip install --editable . script: diff --git a/tox.ini b/tox.ini index 311da6e6..a5b23e41 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,11 @@ [tox] -envlist = py26, py27, pypy, py33, py34 +envlist = py26, py27, pypy, py33, py34, py26-cdecimal, py27-cdecimal [testenv] +install_command = + pip install --allow-external cdecimal {opts} {packages} deps = pytest + cdecimal: cdecimal whitelist_externals = make commands = make clean-cldr test