From 522189da0f238faafc8f1db34f682f49b15ec503 Mon Sep 17 00:00:00 2001
From: Charles-Henri de Boysson <ceache@users.noreply.github.com>
Date: Tue, 14 Apr 2020 23:19:49 -0400
Subject: chore(core): Update matrix: add pypy3, drop py27

Update .travis.yml definition per warnings.
Tests are now only run on py37, py38 and pypy3.
Bumped Zookeeper to 3.5.8.
---
 .travis.yml | 50 +++++++++++++-------------------------------------
 Makefile    |  2 +-
 tox.ini     | 14 +++-----------
 3 files changed, 17 insertions(+), 49 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 06aadee..1f74181 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-sudo: false
+os: linux
 dist: xenial
 addons:
   apt:
@@ -11,57 +11,33 @@ cache:
   directories:
   - zookeeper
 language: python
-python:
-- '2.7'
-matrix:
-  exclude:
-  - python: '2.7'
+jobs:
   include:
-  - python: '2.7'
-    env: ZOOKEEPER_VERSION=3.4.14 TOX_VENV=py27
-  - python: '2.7'
-    env: ZOOKEEPER_VERSION=3.5.7 ZOOKEEPER_PREFIX="apache-" ZOOKEEPER_SUFFIX="-bin" ZOOKEEPER_LIB="lib" TOX_VENV=py27
-  - python: '2.7'
-    env: ZOOKEEPER_VERSION=3.4.14 TOX_VENV=py27-gevent
-  - python: '2.7'
-    env: ZOOKEEPER_VERSION=3.5.7 ZOOKEEPER_PREFIX="apache-" ZOOKEEPER_SUFFIX="-bin" ZOOKEEPER_LIB="lib" TOX_VENV=py27-gevent
-  - python: '2.7'
-    env: ZOOKEEPER_VERSION=3.4.14 TOX_VENV=py27-eventlet
-  - python: '2.7'
-    env: ZOOKEEPER_VERSION=3.5.7 ZOOKEEPER_PREFIX="apache-" ZOOKEEPER_SUFFIX="-bin" ZOOKEEPER_LIB="lib" TOX_VENV=py27-eventlet
   - python: '3.7'
-    env: ZOOKEEPER_VERSION=3.4.14 TOX_VENV=py37
+    env: ZOOKEEPER_VERSION=3.4.14 TOX_VENV=py37-gevent-eventlet-sasl
   - python: '3.7'
-    env: ZOOKEEPER_VERSION=3.4.14 TOX_VENV=py37-sasl
-  - python: '3.7'
-    env: ZOOKEEPER_VERSION=3.5.7 ZOOKEEPER_PREFIX="apache-" ZOOKEEPER_SUFFIX="-bin" ZOOKEEPER_LIB="lib" TOX_VENV=py37
-  - python: '3.7'
-    env: ZOOKEEPER_VERSION=3.5.7 ZOOKEEPER_PREFIX="apache-" ZOOKEEPER_SUFFIX="-bin" ZOOKEEPER_LIB="lib" TOX_VENV=py37-sasl
-  - python: '3.8'
-    env: ZOOKEEPER_VERSION=3.4.14 TOX_VENV=py38
-  - python: '3.8'
-    env: ZOOKEEPER_VERSION=3.4.14 TOX_VENV=py38-sasl
+    env: ZOOKEEPER_VERSION=3.5.8 ZOOKEEPER_PREFIX="apache-" ZOOKEEPER_SUFFIX="-bin" ZOOKEEPER_LIB="lib" TOX_VENV=py37-gevent-eventlet-sasl
   - python: '3.8'
-    env: ZOOKEEPER_VERSION=3.5.7 ZOOKEEPER_PREFIX="apache-" ZOOKEEPER_SUFFIX="-bin" ZOOKEEPER_LIB="lib" TOX_VENV=py38 DEPLOY=true
+    env: ZOOKEEPER_VERSION=3.4.14 TOX_VENV=py38-gevent-eventlet-sasl
   - python: '3.8'
-    env: ZOOKEEPER_VERSION=3.5.7 ZOOKEEPER_PREFIX="apache-" ZOOKEEPER_SUFFIX="-bin" ZOOKEEPER_LIB="lib" TOX_VENV=py38-sasl
-  - python: pypy
-    env: ZOOKEEPER_VERSION=3.4.14 TOX_VENV=pypy
-  - python: 'pypy'
-    env: ZOOKEEPER_VERSION=3.5.7 ZOOKEEPER_PREFIX="apache-" ZOOKEEPER_SUFFIX="-bin" ZOOKEEPER_LIB="lib" TOX_VENV=pypy
+    env: ZOOKEEPER_VERSION=3.5.8 ZOOKEEPER_PREFIX="apache-" ZOOKEEPER_SUFFIX="-bin" ZOOKEEPER_LIB="lib" TOX_VENV=py38-gevent-eventlet-sasl DEPLOY=true
+  - python: 'pypy3'
+    env: ZOOKEEPER_VERSION=3.4.14 TOX_VENV=pypy3-gevent-eventlet-sasl
+  - python: 'pypy3'
+    env: ZOOKEEPER_VERSION=3.5.8 ZOOKEEPER_PREFIX="apache-" ZOOKEEPER_SUFFIX="-bin" ZOOKEEPER_LIB="lib" TOX_VENV=pypy3-gevent-eventlet-sasl
 notifications:
   email: false
 install:
 - pip install tox
 script:
-- make test
+- tox -e ${TOX_VENV}
 deploy:
   provider: pypi
-  user: bbangert
+  username: bbangert
   password:
     secure: L9yXZ2PhQ2wJKQkgigIzW3f/a3ajzUamMdThVelcp/NZeTJfzlC/t89lfSRwLh95o9Z/aIxC4T8yZvNrRzzyMEP0O6s1F69pVm5Px+KBuv82lmI7p5sKTYPp35CE9jH+K/52Fy0+Az5F502xLrkaO4VLLA+zhLffw/qyvNbZui0=
   on:
     tags: true
     condition: $DEPLOY = true
   distributions: release
-  skip_upload_docs: true
+  upload_docs: false
diff --git a/Makefile b/Makefile
index 61fbc41..b03c20f 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ HERE = $(shell pwd)
 BIN = $(HERE)/bin
 PYTHON = $(BIN)/python
 INSTALL = $(BIN)/pip install
-TOX_VENV ?= py27
+TOX_VENV ?= py37
 BUILD_DIRS = bin build include lib lib64 man share
 
 PYTHON_EXE = $(shell [ -f $(PYTHON) ] && echo $(PYTHON) || echo python)
diff --git a/tox.ini b/tox.ini
index 3b0e925..c2c4304 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,17 +3,9 @@ minversion = 3.6
 skipsdist = True
 envlist =
     pep8,
-    py27,
-    py27-{gevent,eventlet,sasl},
-    py34,
-    py34-sasl,
-    py35,
-    py35-sasl,
-    py36,
-    py36-{sasl,docs},
-    py37,
-    py37-{gevent,eventlet,sasl,docs},
-    pypy
+    {py27,py34,py35,py36,py37,py38,pypy3}
+    {gevent,eventlet,sasl,docs},
+    pypy3
 
 [testenv:pep8]
 commands = flake8 {posargs}
-- 
cgit v1.2.1