]> git.ipfire.org Git - thirdparty/babel.git/commitdiff
travis: Add new environments that install cdecimal
authorIsaac Jurado <diptongo@gmail.com>
Sun, 11 Oct 2015 12:20:01 +0000 (14:20 +0200)
committerIsaac Jurado <diptongo@gmail.com>
Wed, 14 Oct 2015 17:52:39 +0000 (19:52 +0200)
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.

.travis.yml
tox.ini

index c7a79b1be7955581bc7190c5f45184305f05b981..d25ad5f2bf31868b10733cd447174b6a60f70525 100644 (file)
@@ -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 311da6e6fb21e87c156ee7091dea5d31a3ad4429..a5b23e41df4e1ed842ad506df25aec3c69066abd 100644 (file)
--- 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