Testing travis.

.travis.yml

@@ -20,19 +20,11 @@ python:
   - '3.3'
 
 
-matrix:
-  include:
-    - python: "2.7"
-      env: UWSGI="2.0.14"
-
-    - python: "3.3"
-      env: UWSGI="2.0.14"
+env:
+  - env: UWSGI="2.0.1"
+  - env: UWSGI="2.0.14"
+  - env: UWSGI="2.0.15"
 
-    - python: "3.4"
-      env: UWSGI="2.0.14"
 
-    - python: "3.5"
-      env: UWSGI="2.0.14"
-
-    - python: "3.6"
-      env: UWSGI="2.0.14"
+matrix:
+  include:

ci/setup

@@ -2,6 +2,11 @@
 
 pip install "pip>=8.1"
 
+if [ "$UWSGI" = "" ]
+then
+   UWSGI="2.0.15"
+fi
+
 pip install "uwsgi==$UWSGI"
 
 pip install -U -r tests_requirements.txt

setup.cfg

@@ -5,12 +5,12 @@ addopts=-s -p no:doctest --flake8 --cov=./
 norecursedirs=pyprometheus build bin dist docs .git
 flake8-max-line-length = 100
 flake8-ignore =
-    *.py E501
+    *.py E501 F821
     main/settings/*.py F403 F401
     */migrations/* ALL
 
 [flake8]
-ignore = E501,F403,F401,D100,D101,D102,D103,I004,I001,I003,Q000,D205,D400,D105
+ignore = E501,F403,F401,D100,D101,D102,D103,I004,I001,I003,Q000,D205,D400,D105,F821
 max-line-length = 100
 exclude = .tox,.git,docs,.ropeproject
 inline-quotes = double

tests/test_storage.py

@@ -4,10 +4,10 @@
 import random
 import threading
 
-try:
-    xrange = xrange
-except Exception:
-    xrange = range
+from pyprometheus import compat
+
+xrange = compat.xrange
+
 
 DATA = (
     ((2, "metric_gauge_name", "", (("label1", "value1"), ("label2", "value2"))), 5),

tests_requirements.txt

@@ -1,9 +1,11 @@
+setuptools==36.0.1
+
 flake8==3.2.1
 tox==2.3.2
 #tox-pyenv==2.3.2
 
 
-ipdb
+ipdb==0.10.2
 uwsgi==2.0.14
 pytest==3.0.6
 pytest-cov==2.4.0