From ab6f262ea1cc19a68cc8258fda567f652037b4aa Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Wed, 30 Aug 2017 09:15:13 -0400 Subject: [PATCH] Update etcd version, add py36 Also remove the upper constraints --- .travis.yml | 53 +++++++++++++++++++++++++++++++---------------- setup-etcd-env.sh | 2 +- tox.ini | 6 ++++-- 3 files changed, 40 insertions(+), 21 deletions(-) diff --git a/.travis.yml b/.travis.yml index c15465a..1d7dbe1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,23 +1,40 @@ -# ref: https://docs.travis-ci.com/user/languages/python -language: python -sudo: true +dist: trusty +sudo: required services: - docker -env: - - TOXENV=pep8 - - TOXENV=pypy - - TOXENV=pypy-etcd - - TOXENV=py27 - - TOXENV=py27-etcd - - TOXENV=py27-codecov - - TOXENV=py35 - - TOXENV=py35-etcd - - TOXENV=docs - - TOXENV=examples - - TOXENV=releasenotes - +language: python +matrix: + include: + - python: 2.7 + env: TOXENV=pep8 + - python: 2.7 + env: TOXENV=py27 + - python: 2.7 + env: TOXENV=py27-etcd + - python: 2.7 + env: TOXENV=py27-codecov + - python: pypy + env: TOXENV=pypy + - python: pypy + env: TOXENV=pypy-etcd + - python: 3.5 + env: TOXENV=py35 + - python: 3.5 + env: TOXENV=py35-etcd + - python: 3.6 + env: TOXENV=py36 + - python: 3.6 + env: TOXENV=py36-etcd +before_install: + - python --version + - uname -a + - lsb_release -a install: - - pip install tox - + - python -m pip install pip -U + - python -m pip install tox coverage coveralls + - python -m virtualenv --version + - python -m easy_install --version + - python -m pip --version + - python -m tox --version script: - tox diff --git a/setup-etcd-env.sh b/setup-etcd-env.sh index fa47ddd..cc6055d 100755 --- a/setup-etcd-env.sh +++ b/setup-etcd-env.sh @@ -1,7 +1,7 @@ #!/bin/bash set -eux if [ -z "$(which etcd)" ]; then - ETCD_VERSION=3.1.4 + ETCD_VERSION=3.1.10 case `uname -s` in Darwin) OS=darwin diff --git a/tox.ini b/tox.ini index aa0782b..56e02a6 100644 --- a/tox.ini +++ b/tox.ini @@ -1,12 +1,11 @@ [tox] minversion = 2.0 -envlist = py35,py27,pypy,pep8 +envlist = py36,py35,py27,pypy,pep8 skipsdist = True [testenv] passenv = TOXENV CI TRAVIS TRAVIS_* usedevelop = True -install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} setenv = VIRTUAL_ENV={envdir} PYTHONWARNINGS=default::DeprecationWarning @@ -43,6 +42,9 @@ commands = {toxinidir}/setup-etcd-env.sh pifpaf -g TOOZ_TEST run etcd -- python [testenv:py35-etcd] commands = {toxinidir}/setup-etcd-env.sh pifpaf -g TOOZ_TEST run etcd -- python setup.py test --slowest --testr-args='{posargs}' +[testenv:py36-etcd] +commands = {toxinidir}/setup-etcd-env.sh pifpaf -g TOOZ_TEST run etcd -- python setup.py test --slowest --testr-args='{posargs}' + [testenv:examples] commands = {toxinidir}/setup-etcd-env.sh pifpaf -g TOOZ_TEST run etcd -- python {toxinidir}/etcd3gw/examples/etcd.py