From 3437e7592b85a58eea3425a3f889d28d137c8ef5 Mon Sep 17 00:00:00 2001 From: Abhas Bhattacharya Date: Thu, 14 Jan 2016 03:34:49 +0530 Subject: [PATCH] Use py35, reorder tox and travis --- .travis.yml | 15 +++++++-------- tox.ini | 5 +---- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 004df6b..b187ffa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,15 +6,14 @@ addons: packages: - redis-server -matrix: - # major versions, test first - include: - - env: TOXENV=py27 - - env: TOXENV=py35-dev - python: "3.5-dev" +# matrix: +# # major versions, test first +# include: +# - env: TOXENV=py35 +# python: "3.5" env: - # - TOXENV=py27 - # - TOXENV=py35-dev + - TOXENV=py27 + - TOXENV=py35 # other versions - TOXENV=py26 - TOXENV=py33 diff --git a/tox.ini b/tox.ini index fd1d248..d905144 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] skipsdist = true -envlist = py{26,27,34,35} +envlist = py{26,27,34,35,py} [testenv] deps = pytest @@ -10,6 +10,3 @@ passenv = PYTEST_STATUS_PORT commands = pip install . py.test -v - -[testenv:py35-dev] -basepython = python3.5-dev