Merge pull request #435 from davidszotten/more_py_versions

bump oldest reqs to support python 3.5 and 3.6. drop support for 3.3.
nameko · May 10, 2017 · 960f286 · 960f286
2 parents 9d00c23 + abb15e9
commit 960f286
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 33 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,5 @@
 sudo: false
 language: python
-python:
-  - "2.7"
 
 services:
     - rabbitmq
@@ -23,31 +21,55 @@ cache:
   directories:
     - $HOME/.cache/pip
 
-env:
-  - TOX_ENV=py27-oldest-lib
-  - TOX_ENV=py27-pinned-lib
-  - TOX_ENV=py27-latest-lib
-  - TOX_ENV=py27-mastereventlet-lib
-  - TOX_ENV=py33-oldest-lib
-  - TOX_ENV=py33-pinned-lib
-  - TOX_ENV=py33-latest-lib
-  - TOX_ENV=py33-mastereventlet-lib
-  - TOX_ENV=py34-oldest-lib
-  - TOX_ENV=py34-pinned-lib
-  - TOX_ENV=py34-latest-lib
-  - TOX_ENV=py34-mastereventlet-lib
-  - TOX_ENV=py34-branchcoverage-lib
-  - TOX_ENV=py27-examples
-  - TOX_ENV=py34-examples
-  - TOX_ENV=docs
-
 matrix:
+  include:
+    - python: 2.7
+      env: TOX_ENV=py27-oldest-lib
+    - python: 2.7
+      env: TOX_ENV=py27-pinned-lib
+    - python: 2.7
+      env: TOX_ENV=py27-latest-lib
+    - python: 2.7
+      env: TOX_ENV=py27-mastereventlet-lib
+    - python: 2.7
+      env: TOX_ENV=py27-examples
+    - python: 3.4
+      env: TOX_ENV=py34-oldest-lib
+    - python: 3.4
+      env: TOX_ENV=py34-pinned-lib
+    - python: 3.4
+      env: TOX_ENV=py34-latest-lib
+    - python: 3.4
+      env: TOX_ENV=py34-mastereventlet-lib
+    - python: 3.5
+      env: TOX_ENV=py35-oldest-lib
+    - python: 3.5
+      env: TOX_ENV=py35-pinned-lib
+    - python: 3.5
+      env: TOX_ENV=py35-latest-lib
+    - python: 3.5
+      env: TOX_ENV=py35-mastereventlet-lib
+    - python: 3.6
+      env: TOX_ENV=py36-oldest-lib
+    - python: 3.6
+      env: TOX_ENV=py36-pinned-lib
+    - python: 3.6
+      env: TOX_ENV=py36-latest-lib
+    - python: 3.6
+      env: TOX_ENV=py36-mastereventlet-lib
+    - python: 3.6
+      env: TOX_ENV=py36-branchcoverage-lib
+    - python: 3.6
+      env: TOX_ENV=py36-examples
+    - python: 3.6
+      env: TOX_ENV=docs
   fast_finish: true
   allow_failures:
     - env: TOX_ENV=py27-mastereventlet-lib
-    - env: TOX_ENV=py33-mastereventlet-lib
     - env: TOX_ENV=py34-mastereventlet-lib
-    - env: TOX_ENV=py34-branchcoverage-lib
+    - env: TOX_ENV=py35-mastereventlet-lib
+    - env: TOX_ENV=py36-mastereventlet-lib
+    - env: TOX_ENV=py36-branchcoverage-lib
 
 script:
   - tox -e $TOX_ENV

diff --git a/setup.py b/setup.py
@@ -35,10 +35,10 @@
         'dev': [
             "coverage==4.2",
             "flake8==3.2.1",
-            "mccabe==0.5.2",
-            "pycodestyle==2.2.0",
-            "pyflakes==1.3.0",
-            "pylint==1.6.4",
+            "mccabe==0.6.1",
+            "pycodestyle==2.3.1",
+            "pyflakes==1.5.0",
+            "pylint==1.7.1",
             "pytest==2.7.3",
             "pytest-cov==2.1.0",
             "pytest-timeout==0.4",

diff --git a/test/test_messaging.py b/test/test_messaging.py
@@ -24,7 +24,7 @@
 foobar_ex = Exchange('foobar_ex', durable=False)
 foobar_queue = Queue('foobar_queue', exchange=foobar_ex, durable=False)
 
-CONSUME_TIMEOUT = 1
+CONSUME_TIMEOUT = 1.2  # a bit more than 1 second
 
 
 @pytest.yield_fixture

diff --git a/tox.ini b/tox.ini
@@ -1,18 +1,16 @@
 [tox]
-envlist = {py27,py33,py34}-{oldest,pinned,latest,mastereventlet}-lib, py34-branchcoverage-lib, {py27,py34}-examples, docs
+envlist = {py27,py34,py35,py36}-{oldest,pinned,latest,mastereventlet}-lib, py36-branchcoverage-lib, {py27,py36}-examples, docs
 skipsdist = True
 
 [testenv]
 deps =
     # oldest supported libraries for each python
-    py27-oldest: eventlet==0.17.4
-    py{33,34}-oldest: eventlet==0.17.4
-    py27-oldest: kombu==3.0.30
-    py{33,34}-oldest: kombu==3.0.15
+    oldest: eventlet==0.17.4
+    oldest: kombu==3.0.30
     oldest: mock==1.2.0
     oldest: path.py==6.2
     py27-oldest: requests==1.2.0
-    py{33,34}-oldest: requests==2.0.0
+    py{34,35,36}-oldest: requests==2.0.0
     oldest: six==1.10.0
     oldest: werkzeug==0.9
     oldest: wrapt==1.0.0