summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorankitjavalkar2017-03-02 16:30:26 +0530
committerankitjavalkar2017-03-02 16:33:03 +0530
commit08641e715174b6361f7f4b26625ed7cd3b10cc26 (patch)
treed42f6338eb397cee0e90ff94482be41c9af970dc
parent15deb7d186746d8fcba53ecba876ae746767e26d (diff)
downloadonline_test-08641e715174b6361f7f4b26625ed7cd3b10cc26.tar.gz
online_test-08641e715174b6361f7f4b26625ed7cd3b10cc26.tar.bz2
online_test-08641e715174b6361f7f4b26625ed7cd3b10cc26.zip
Modify travis.yml to:
- Install dependencies from requirements and use setup.py Modify setup.py to remove selenium from install_requires
-rw-r--r--.travis.yml13
-rw-r--r--setup.py1
2 files changed, 5 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml
index da71f7a..f1c4dab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,14 +4,6 @@ python:
- "2.7"
- "3.5"
-env:
- - DJANGO=1.9.5
-
-# command to install dependencies
-install:
- - pip install git+https://github.com/FOSSEE/online_test.git#egg=yaksh-0.1
- - pip install -q Django==$DJANGO
-
before_install:
- sudo apt-get update -qq
- sudo apt-get install -y scilab
@@ -19,6 +11,11 @@ before_install:
- "sh -e /etc/init.d/xvfb start"
- sleep 3 # give xvfb some time to start
+# command to install dependencies
+install:
+ - pip install -r requirements/requirements-common.txt
+ - python setup.py develop
+
# command to run tests
script:
- python manage.py test -v 2 yaksh
diff --git a/setup.py b/setup.py
index e7d1cbc..37ed948 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,6 @@ install_requires = [
'pytz==2016.4',
'python-social-auth==0.2.19',
'tornado',
- 'selenium==2.53.6',
]
setup(