tox-travis (#15)

.travis.yml

@@ -2,55 +2,10 @@ language: python
 
 python:
   - "2.7"
+  - "3.4"
+  - "3.5"
+  - "3.6"
+  - "3.7-dev"
   - "pypy"
-
-env:
-  - FLASK="==0.8" PUSHER="pusher<1.0"
-  - FLASK="==0.8"
-  - FLASK="==0.9" PUSHER="pusher<1.0"
-  - FLASK="==0.9"
-  - FLASK="==0.10.1" PUSHER="pusher<1.0"
-  - FLASK="==0.10.1" PUSHER="pusher>=1.0,<1.1"
-  - FLASK="==0.10.1" PUSHER="pusher>=1.1,<1.2"
-  - FLASK="==0.10.1" PUSHER="pusher>=1.2,<1.3"
-  - FLASK="==0.10.1" PUSHER="pusher>=1.3,<1.4"
-  - FLASK="==0.10.1" PUSHER="pusher>=1.4,<1.5"
-  - FLASK="==0.10.1" PUSHER="pusher>=1.5,<1.6"
-  - FLASK="==0.10.1"
-  - FLASK="==0.10.1" PUSHER="git+https://github.com/pusher/pusher-http-python.git"
-  - FLASK="==0.11" PUSHER="pusher<1.0"
-  - FLASK="==0.11" PUSHER="pusher>=1.0,<1.1"
-  - FLASK="==0.11" PUSHER="pusher>=1.1,<1.2"
-  - FLASK="==0.11" PUSHER="pusher>=1.2,<1.3"
-  - FLASK="==0.11" PUSHER="pusher>=1.3,<1.4"
-  - FLASK="==0.11" PUSHER="pusher>=1.4,<1.5"
-  - FLASK="==0.11" PUSHER="pusher>=1.5,<1.6"
-  - FLASK="==0.11"
-  - FLASK="==0.11" PUSHER="git+https://github.com/pusher/pusher-http-python.git"
-
-matrix:
-  include:
-    - python: 3.4
-      env: FLASK="==0.10.1"
-    - python: 3.4
-      env: FLASK="==0.11"
-    - python: 3.5
-      env: FLASK="==0.10.1"
-    - python: 3.5
-      env: FLASK="==0.11"
-    - python: 3.6
-      env: FLASK="==0.10.1"
-    - python: 3.6
-      env: FLASK="==0.11"
-
-install:
-  - pip install Flask$FLASK $PUSHER
-  - pip install unittest2 coverage coveralls
-  - python setup.py install
-
-script:
-  - coverage run --source=flask_pusher setup.py test
-
-after_success:
-  - coveralls
-
+install: pip install tox-travis
+script: tox

flask_pusher.py

@@ -5,7 +5,7 @@
 from flask import Blueprint, current_app, request, abort, json
 try:
     from flask_jsonpify import jsonify
-except ImportError:
+except ImportError:  # pragma: no cover
     from flask import jsonify
 
 import pusher as _pusher
@@ -100,7 +100,7 @@ def init_app(self, app):
         argspec = inspect.getargspec(_pusher.Pusher.__init__)
         expected_args = set(argspec.args)
         ignored_args = []
-        for key, value in pusher_kwargs.items():
+        for key in list(pusher_kwargs):
             if key not in expected_args:
                 ignored_args.append(key)
                 del pusher_kwargs[key]

setup.py

@@ -14,7 +14,7 @@
     platforms='any',
     install_requires=[
         'Flask',
-        'pusher<2.0',
+        'pusher',
         'Flask-Jsonpify',  # for jsonp auth support
     ],
     test_suite="tests",