diff options
| author | prathamesh | 2016-10-04 17:22:20 +0530 |
|---|---|---|
| committer | prathamesh | 2016-10-04 17:22:20 +0530 |
| commit | 9c14e2b2026074234d9c977ca17b0c96b0789f6b (patch) | |
| tree | 8b6c8e2438563e56631c2adf986e7cb16c33afb4 /.travis.yml | |
| parent | c5ae3d4589a71c3f3b9f622c7b67a04277269cde (diff) | |
| parent | 91dd42214ba5ad88c5158b50a7746caa3841a883 (diff) | |
| download | online_test-9c14e2b2026074234d9c977ca17b0c96b0789f6b.tar.gz online_test-9c14e2b2026074234d9c977ca17b0c96b0789f6b.tar.bz2 online_test-9c14e2b2026074234d9c977ca17b0c96b0789f6b.zip | |
Merge branch 'master' of https://github.com/FOSSEE/online_test into edit_questionpaper
Resolved
Conflicts:
yaksh/views.py
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 3484d2d..c47785e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: python python: - "2.7" + - "3.5" env: - DJANGO=1.8.13 @@ -9,12 +10,8 @@ env: # command to install dependencies install: - - pip install tornado - pip install git+https://github.com/FOSSEE/online_test.git#egg=yaksh-0.1 - pip install -q Django==$DJANGO - - pip install -q pytz==2016.4 - - pip install -q python-social-auth==0.2.19 - - pip install selenium before_install: - sudo apt-get update -qq |