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 diff --git a/.travis.yml b/.travis.yml index 6fd77973..3fa61510 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,9 +14,12 @@ matrix: install: - if [ "$TRAVIS_PYTHON_VERSION" == "2.6" ]; then pip install unittest2; fi + - pip install --upgrade setuptools - pip install future + - pip install Pillow==3.4.2 - python setup.py install --quiet - pip install --quiet pytest-cov + - pip install PyMySQL script: # test_05vector_07slp takes too long (so travis errors the build), it also fails on py2!