From b59bf1b6799a189a7ae47e6fa1a9feec47fd0e6c Mon Sep 17 00:00:00 2001
From: Omer Katz <omer.drow@gmail.com>
Date: Thu, 16 Aug 2018 07:53:25 -0500
Subject: [PATCH] Added Python 3.7 to the build matrix (#908)

* Run tests with Python 3.7.

* Add missing dependencies.

* Show skip reasons.

* Add more dependencies to CI tests.

* Fix requirements.
---
 .travis.yml              | 5 +++++
 requirements/docs.txt    | 1 -
 requirements/test-ci.txt | 3 +++
 tox.ini                  | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8a08118f..d2a08498 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,11 @@ matrix:
       env: TOXENV=3.5
     - python: 3.6
       env: TOXENV=3.6
+    - python: 3.7
+      env: TOXENV=3.7
+      sudo: true
+      dist: xenial
+      before_install: sudo apt-get update && sudo apt-get install libgnutls-dev
     - python: pypy
       env: TOXENV=pypy
     - env: TOXENV=flake8
diff --git a/requirements/docs.txt b/requirements/docs.txt
index db098342..8168d4eb 100644
--- a/requirements/docs.txt
+++ b/requirements/docs.txt
@@ -1,3 +1,2 @@
 git+https://github.com/celery/sphinx_celery.git
-librabbitmq
 -r extras/mongodb.txt
diff --git a/requirements/test-ci.txt b/requirements/test-ci.txt
index b3cd5427..4bb72214 100644
--- a/requirements/test-ci.txt
+++ b/requirements/test-ci.txt
@@ -4,4 +4,7 @@ redis
 PyYAML
 msgpack-python>0.2.0
 -r extras/sqs.txt
+-r extras/consul.txt
+-r extras/librabbitmq.txt
+-r extras/zookeeper.txt
 sqlalchemy
diff --git a/tox.ini b/tox.ini
index a9babc1c..d8261de0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,7 +25,7 @@ deps=
     flake8,flakeplus,pydocstyle: -r{toxinidir}/requirements/pkgutils.txt
 
 commands = pip install -U -r{toxinidir}/requirements/dev.txt
-           pytest -xv --cov=kombu --cov-report=xml --no-cov-on-fail {posargs}
+           pytest -rxs -xv --cov=kombu --cov-report=xml --no-cov-on-fail {posargs}
 
 basepython =
     2.7,flakeplus,flake8,apicheck,linkcheck,cov,pydocstyle: python2.7