diff options
| author | Lasse Schuirmann <lasse@schuirmann.net> | 2015-12-29 01:40:35 +0100 |
|---|---|---|
| committer | Lasse Schuirmann <lasse@schuirmann.net> | 2015-12-29 01:40:35 +0100 |
| commit | 5d0c4ef8a55bc507650e9ff750328883d371d5c3 (patch) | |
| tree | 3a6fc01a6635982e48e62af72ef35a3acdc90bf2 | |
| parent | b088a3d1f21061c0d2b74cb68e174264664ba048 (diff) | |
| parent | b5d400f3cfe53bd2683bb95711b7117bc3a5e9f0 (diff) | |
| download | babel-5d0c4ef8a55bc507650e9ff750328883d371d5c3.tar.gz | |
Merge pull request #302 from etanol/fix-builds
Try to fix the broken builds
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rw-r--r-- | tox.ini | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 8d5433e..29eedd4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,13 +16,13 @@ matrix: - os: linux python: 2.6 env: - - CDECIMAL=cdecimal + - CDECIMAL=m3-cdecimal - os: linux python: 2.7 - os: linux python: 2.7 env: - - CDECIMAL=cdecimal + - CDECIMAL=m3-cdecimal - os: linux python: pypy - os: linux @@ -43,7 +43,7 @@ matrix: - PYTHON_VERSION=2.6.6 - PYENV_ROOT=~/.pyenv - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin - - CDECIMAL=cdecimal + - CDECIMAL=m3-cdecimal - os: osx language: generic env: @@ -56,7 +56,7 @@ matrix: - PYTHON_VERSION=2.7.10 - PYENV_ROOT=~/.pyenv - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin - - CDECIMAL=cdecimal + - CDECIMAL=m3-cdecimal - os: osx language: generic env: @@ -85,7 +85,7 @@ matrix: install: - bash .ci/deps.${TRAVIS_OS_NAME}.sh - pip install --upgrade pip - - pip install --allow-external cdecimal --upgrade pytest==2.8.5 pytest-cov==2.2.0 $CDECIMAL + - pip install --upgrade pytest==2.8.5 pytest-cov==2.2.0 $CDECIMAL - pip install --editable . script: @@ -2,10 +2,8 @@ envlist = py26, py27, pypy, py33, py34, py26-cdecimal, py27-cdecimal [testenv] -install_command = - pip install --allow-external cdecimal {opts} {packages} deps = pytest - cdecimal: cdecimal + cdecimal: m3-cdecimal whitelist_externals = make commands = make clean-cldr test |