From 97e18a1ea19180249fc38a50c556060fb437bf0f Mon Sep 17 00:00:00 2001 From: INADA Naoki Date: Sun, 19 Feb 2017 20:11:49 +0900 Subject: [PATCH] stop using tox. --- .travis.yml | 34 ++++++++++++++++------------------ tox.ini | 12 ------------ 2 files changed, 16 insertions(+), 30 deletions(-) delete mode 100644 tox.ini diff --git a/.travis.yml b/.travis.yml index cb7f09d..6600eee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,35 +1,33 @@ sudo: false +dist: trusty language: python -python: "3.5" +python: + - "nightly" + - "pypy-5.3.1" + - "3.6-dev" + - "3.6" + - "3.5" + - "3.4" + - "2.7" cache: pip + install: - - pip install tox - -matrix: - include: - - python: "3.6-dev" - env: - - TOX_ENV=py36 - - TESTDB=travis.cnf - + - pip install -U pip + - pip install -U mock coverage pytest pytest-cov env: - matrix: - - TOX_ENV=py26 - - TOX_ENV=py27 - - TOX_ENV=pypy - - TOX_ENV=py33 - - TOX_ENV=py34 - - TOX_ENV=py35 global: - TESTDB=travis.cnf + before_script: - "mysql --help" - "mysql --print-defaults" - "mysql -e 'create database mysqldb_test charset utf8mb4;'" -script: tox -e $TOX_ENV +script: + - pip install -e . + - py.test --cov ./MySQLdb # vim: sw=2 ts=2 sts=2 diff --git a/tox.ini b/tox.ini deleted file mode 100644 index 4c7fe5f..0000000 --- a/tox.ini +++ /dev/null @@ -1,12 +0,0 @@ -[tox] -envlist = py26, py27, pypy, py33, py34, py35 - -[testenv] -passenv = TESTDB -commands = - py.test --cov {envsitepackagesdir}/MySQLdb -deps = - mock - coverage==3.7.1 - pytest - pytest-cov