From a9159cedc38fcf3e1f112ce49c3e07aa7e541e01 Mon Sep 17 00:00:00 2001 From: ut2496 Date: Mon, 27 Mar 2017 20:41:00 +0530 Subject: [PATCH 1/7] Added the MYSQL client --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 6fd77973..3a38cb04 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,7 @@ install: - pip install future - python setup.py install --quiet - pip install --quiet pytest-cov + - pip install MySQL-python script: # test_05vector_07slp takes too long (so travis errors the build), it also fails on py2! From 67448344c532c2ee19d53221ef81ec28634fa53a Mon Sep 17 00:00:00 2001 From: ut2496 Date: Mon, 27 Mar 2017 20:59:12 +0530 Subject: [PATCH 2/7] Added the MYSQL client and added Pillow beforehand ( commit 2) --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 3a38cb04..dababf46 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,7 @@ matrix: install: - if [ "$TRAVIS_PYTHON_VERSION" == "2.6" ]; then pip install unittest2; fi - pip install future + - pip install Pillow - python setup.py install --quiet - pip install --quiet pytest-cov - pip install MySQL-python From 42e339530328aca8739644ccf80cbe65542c8dc1 Mon Sep 17 00:00:00 2001 From: ut2496 Date: Mon, 27 Mar 2017 21:18:21 +0530 Subject: [PATCH 3/7] Added the MYSQL client and added Pillow beforehand , u( commit attempt 3) --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index dababf46..9817725c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,8 @@ matrix: install: - if [ "$TRAVIS_PYTHON_VERSION" == "2.6" ]; then pip install unittest2; fi + - pip install --upgrade setuptools + - apt-get install libtiff4-dev libjpeg8-dev zlib1g-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.5-dev tk8.5-dev python-tk - pip install future - pip install Pillow - python setup.py install --quiet From 8eb5b423b6c364aaa3332f76a03758dbf199feac Mon Sep 17 00:00:00 2001 From: ut2496 Date: Mon, 27 Mar 2017 21:19:59 +0530 Subject: [PATCH 4/7] Added the MYSQL client and added Pillow beforehand , upgraded setuptools and added conditions for ubuntu 12.04 since the Travis CI uses that as its operating system( commit attempt 3) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9817725c..1a6dce58 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ matrix: install: - if [ "$TRAVIS_PYTHON_VERSION" == "2.6" ]; then pip install unittest2; fi - pip install --upgrade setuptools - - apt-get install libtiff4-dev libjpeg8-dev zlib1g-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.5-dev tk8.5-dev python-tk + - apt-get install libtiff4-dev libjpeg8-dev zlib1g-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.5-dev tk8.5-dev python-tkg - pip install future - pip install Pillow - python setup.py install --quiet From 7f9ef278dd412e3ad0f757ee493e301445e16dfc Mon Sep 17 00:00:00 2001 From: ut2496 Date: Mon, 27 Mar 2017 21:25:33 +0530 Subject: [PATCH 5/7] Added the MYSQL client and added Pillow beforehand , upgraded setuptools( commit attempt 4) --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1a6dce58..cdb7d94d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,6 @@ matrix: install: - if [ "$TRAVIS_PYTHON_VERSION" == "2.6" ]; then pip install unittest2; fi - pip install --upgrade setuptools - - apt-get install libtiff4-dev libjpeg8-dev zlib1g-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.5-dev tk8.5-dev python-tkg - pip install future - pip install Pillow - python setup.py install --quiet From 3fa7174ed9d1b8b5c1a681d4c6f39c13c3f670d0 Mon Sep 17 00:00:00 2001 From: ut2496 Date: Mon, 27 Mar 2017 21:27:26 +0530 Subject: [PATCH 6/7] Added the MYSQL client and added Pillow beforehand , upgraded setuptools( commit attempt 5) --- .idea/vcs.xml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .idea/vcs.xml diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..94a25f7f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From 3324cffa5f75c05558c3ead1daf74c3bca1bd270 Mon Sep 17 00:00:00 2001 From: ut2496 Date: Mon, 27 Mar 2017 22:09:20 +0530 Subject: [PATCH 7/7] ( commit attempt 6) Added the MYSQL client , upgraded setuptools and added Pillow beforehand (due to Python 2.6.9) --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index cdb7d94d..3fa61510 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,10 +16,10 @@ install: - if [ "$TRAVIS_PYTHON_VERSION" == "2.6" ]; then pip install unittest2; fi - pip install --upgrade setuptools - pip install future - - pip install Pillow + - pip install Pillow==3.4.2 - python setup.py install --quiet - pip install --quiet pytest-cov - - pip install MySQL-python + - pip install PyMySQL script: # test_05vector_07slp takes too long (so travis errors the build), it also fails on py2!