Merge pull request #569 from edx/thallada/travis-data-api-version

Add variable to .travis.yml for Data API checkout version for acceptance tests

.travis.yml

@@ -4,17 +4,21 @@ language:
 python: "2.7"
 node_js: "5.2.0"
 sudo: false
+env:
+  # Make sure to update this string on every Insights or Data API release
+  - DATA_API_VERSION="0.17.0-rc.1"
 before_install:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
 addons:
+    firefox: "46.0"
     apt:
         packages:
             - language-pack-en
 install:
     - make develop
     - make migrate
-    - ./scripts/install_analytics_data_api.sh
+    - ./scripts/install_analytics_data_api.sh $DATA_API_VERSION
     - pip install coveralls
 script:
     - make static_no_compress

requirements/test.txt

@@ -16,6 +16,6 @@ pep257==0.7.0
 pep8==1.7.0
 pylint==1.6.4
 logilab-common==1.2.2
-selenium>=2.44.0
+selenium>=2.44.0,<3.0.0
 sure==1.4.0
 testfixtures==4.10.0

scripts/install_analytics_data_api.sh

@@ -2,6 +2,11 @@
 
 git clone https://github.com/edx/edx-analytics-data-api.git
 cd edx-analytics-data-api
+if [ -z $1 ]; then
+  git checkout master
+else
+  git checkout $1
+fi
 virtualenv venv
 source venv/bin/activate
 make requirements