Skip to content

Commit c0343f8

Browse files
committed
Testing travis.
1 parent 9d6e066 commit c0343f8

File tree

5 files changed

+20
-21
lines changed

5 files changed

+20
-21
lines changed

.travis.yml

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,11 @@ python:
2020
- '3.3'
2121

2222

23-
matrix:
24-
include:
25-
- python: "2.7"
26-
env: UWSGI="2.0.14"
27-
28-
- python: "3.3"
29-
env: UWSGI="2.0.14"
23+
env:
24+
- env: UWSGI="2.0.1"
25+
- env: UWSGI="2.0.14"
26+
- env: UWSGI="2.0.15"
3027

31-
- python: "3.4"
32-
env: UWSGI="2.0.14"
3328

34-
- python: "3.5"
35-
env: UWSGI="2.0.14"
36-
37-
- python: "3.6"
38-
env: UWSGI="2.0.14"
29+
matrix:
30+
include:

ci/setup

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
pip install "pip>=8.1"
44

5+
if [ "$UWSGI" = "" ]
6+
then
7+
UWSGI="2.0.15"
8+
fi
9+
510
pip install "uwsgi==$UWSGI"
611

712
pip install -U -r tests_requirements.txt

setup.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ addopts=-s -p no:doctest --flake8 --cov=./
55
norecursedirs=pyprometheus build bin dist docs .git
66
flake8-max-line-length = 100
77
flake8-ignore =
8-
*.py E501
8+
*.py E501 F821
99
main/settings/*.py F403 F401
1010
*/migrations/* ALL
1111

1212
[flake8]
13-
ignore = E501,F403,F401,D100,D101,D102,D103,I004,I001,I003,Q000,D205,D400,D105
13+
ignore = E501,F403,F401,D100,D101,D102,D103,I004,I001,I003,Q000,D205,D400,D105,F821
1414
max-line-length = 100
1515
exclude = .tox,.git,docs,.ropeproject
1616
inline-quotes = double

tests/test_storage.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
import random
55
import threading
66

7-
try:
8-
xrange = xrange
9-
except Exception:
10-
xrange = range
7+
from pyprometheus import compat
8+
9+
xrange = compat.xrange
10+
1111

1212
DATA = (
1313
((2, "metric_gauge_name", "", (("label1", "value1"), ("label2", "value2"))), 5),

tests_requirements.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1+
setuptools==36.0.1
2+
13
flake8==3.2.1
24
tox==2.3.2
35
#tox-pyenv==2.3.2
46

57

6-
ipdb
8+
ipdb==0.10.2
79
uwsgi==2.0.14
810
pytest==3.0.6
911
pytest-cov==2.4.0

0 commit comments

Comments
 (0)