diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index acd1dd834c105ae0f6e2a8e3409cd2c7cb829244..0000000000000000000000000000000000000000 --- a/.travis.yml +++ /dev/null @@ -1,41 +0,0 @@ -sudo: false -language: python -python: - - "2.7" - - "3.4" - -env: - global: - - TMPDIR=/var/tmp - matrix: - - CHERRYPY=3.2 - - CHERRYPY=3.5 - - CHERRYPY=4 - - CHERRYPY=5 - - CHERRYPY=6 - - CHERRYPY=7 - - CHERRYPY=8 - - CHERRYPY=9 - - CHERRYPY=10 - - CHERRYPY=11 - - CHERRYPY=12 - - CHERRYPY=13 - - CHERRYPY=14 - - CHERRYPY=15 - - CHERRYPY=16 - -# Make sure to exclude python3.4 + CherryPy 3.2.2 -# This configuration is not supported. -matrix: - exclude: - - python: "3.4" - env: CHERRYPY=3.2 - -before_install: - # Install requirements - - sudo apt-get install python-pysqlite2 rdiff-backup - - sudo pip install tox-travis -# Need to compile the catalogs before running the test -script: - - python setup.py compile_all_catalogs - - tox \ No newline at end of file diff --git a/tox.ini b/tox.ini index e9a9d71726be5dc209597a972504ba251b929ad3..cc645887237c8ab9440e2fc7002bc0c1588b532b 100644 --- a/tox.ini +++ b/tox.ini @@ -39,21 +39,3 @@ deps= setenv = COVERAGE_FILE=.coverage.{envname} commands=python setup.py nosetests --xunit-file=nosetests-{envname}.xml --xunit-testsuite-name={envname} - -[travis:env] -CHERRYPY = - 3.2: cherrypy32 - 3.5: cherrypy35 - 4: cherrypy4 - 5: cherrypy5 - 6: cherrypy6 - 7: cherrypy7 - 8: cherrypy8 - 9: cherrypy9 - 10: cherrypy10 - 11: cherrypy11 - 12: cherrypy12 - 13: cherrypy13 - 14: cherrypy14 - 14: cherrypy15 - 14: cherrypy16 \ No newline at end of file