summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Dufresne <jon.dufresne@gmail.com>2017-04-16 21:24:52 -0700
committerAsif Saifuddin Auvi <auvipy@users.noreply.github.com>2017-04-17 10:24:52 +0600
commitba82a72c210a10a50546c4990e6f05628387c983 (patch)
treef0a42d6cf5c13e87693320009dffd2fc673ae2e6
parentf4fda3858fed00e66c8a46b94c6efb994bd06c60 (diff)
downloadkombu-ba82a72c210a10a50546c4990e6f05628387c983.tar.gz
Add Python 3.6 to CI testing (#716)
Enabled pip cache for Travis CI
-rw-r--r--.travis.yml34
-rw-r--r--appveyor.yml17
-rw-r--r--tox.ini1
3 files changed, 38 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml
index 58734dc7..e077fc59 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,21 +1,29 @@
language: python
sudo: false
-cache: false
-python:
- - '3.5'
+cache: pip
+
env:
global:
PYTHONUNBUFFERED=yes
- matrix:
- - TOXENV=2.7
- - TOXENV=3.4
- - TOXENV=3.5
- - TOXENV=pypy
- - TOXENV=flake8
- - TOXENV=flakeplus
- - TOXENV=apicheck
- - TOXENV=pydocstyle
- - TOXENV=cov
+
+matrix:
+ include:
+ - python: 2.7
+ env: TOXENV=2.7
+ - python: 3.4
+ env: TOXENV=3.4
+ - python: 3.5
+ env: TOXENV=3.5
+ - python: 3.6
+ env: TOXENV=3.6
+ - python: pypy
+ env: TOXENV=pypy
+ - env: TOXENV=flake8
+ - env: TOXENV=flakeplus
+ - env: TOXENV=apicheck
+ - env: TOXENV=pydocstyle
+ - env: TOXENV=cov
+
install: travis_retry pip install -U tox
script: tox -v -- -v
after_success:
diff --git a/appveyor.yml b/appveyor.yml
index 07c259a0..9bd8a39f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -20,6 +20,14 @@ environment:
PYTHON_VERSION: "3.4.x"
PYTHON_ARCH: "32"
+ - PYTHON: "C:\\Python35"
+ PYTHON_VERSION: "3.5.x"
+ PYTHON_ARCH: "32"
+
+ - PYTHON: "C:\\Python36"
+ PYTHON_VERSION: "3.6.x"
+ PYTHON_ARCH: "32"
+
- PYTHON: "C:\\Python27-x64"
PYTHON_VERSION: "2.7.x"
PYTHON_ARCH: "64"
@@ -30,6 +38,15 @@ environment:
PYTHON_ARCH: "64"
WINDOWS_SDK_VERSION: "v7.1"
+ - PYTHON: "C:\\Python35-x64"
+ PYTHON_VERSION: "3.5.x"
+ PYTHON_ARCH: "64"
+ WINDOWS_SDK_VERSION: "v7.1"
+
+ - PYTHON: "C:\\Python36-x64"
+ PYTHON_VERSION: "3.6.x"
+ PYTHON_ARCH: "64"
+ WINDOWS_SDK_VERSION: "v7.1"
init:
- "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%"
diff --git a/tox.ini b/tox.ini
index 853eb899..3f9bdcf5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -29,7 +29,6 @@ commands = pip install -U -r{toxinidir}/requirements/dev.txt
basepython =
2.7,flakeplus,flake8,apicheck,linkcheck,cov,pydocstyle: python2.7
- 3.3: python3.3
3.4: python3.4
3.5: python3.5
3.6: python3.6