From 039d3d24827ff128129c061c48c436a69804a40c Mon Sep 17 00:00:00 2001 From: HelioGuilherme66 Date: Tue, 6 Sep 2016 13:28:02 +0100 Subject: [PATCH] Adds Travis configuration for Python 3.4 and 3.5. Removes configuration for Python 2.6. Updates Firefox for latest ESR. --- .travis.yml | 21 +++++++++++++++------ .travis_python_dep.sh | 17 +++++++++++++++++ 2 files changed, 32 insertions(+), 6 deletions(-) create mode 100755 .travis_python_dep.sh diff --git a/.travis.yml b/.travis.yml index 3125407a4..2113bdc83 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,24 @@ +addons: + firefox: latest-esr language: python sudo: false python: - - "2.6" - "2.7" -install: + - "3.4" + - "3.5" +before_install: + - "./.travis_python_dep.sh" +install: true #- pip install pep8 --use-mirrors #- pip install pyflakes --use-mirrors - - pip install robotframework - - pip install selenium - - pip install decorator - - pip install docutils + # Installation is done at before_install + ##- pip install robotframework + ##- pip install selenium + ##- pip install decorator + ##- pip install docutils + ##- pip install future + # Mockito is only used when in Python 2.7 after installing future + ##- pip install mockito #- "if [[ ${BROWSER} == 'ie' ]]; then pip install ie_only_pkg; fi" before_script: - "export DISPLAY=:99.0" diff --git a/.travis_python_dep.sh b/.travis_python_dep.sh new file mode 100755 index 000000000..5c806f7c2 --- /dev/null +++ b/.travis_python_dep.sh @@ -0,0 +1,17 @@ +#!/bin/bash +set -ev +PYTHON_VERSION=`python -c "import sys; print(sys.version[:3])"` +if [ "${PYTHON_VERSION}" = "2.7" ]; then + pip install robotframework + pip install selenium + pip install decorator + pip install docutils + pip install future + pip install mockito +elif [ "${PYTHON_VERSION}" = "3.4" -o "${PYTHON_VERSION}" = "3.5" ]; then + pip install robotframework + pip install selenium + pip install decorator + pip install docutils + pip install future +fi