Skip to content

Commit 4b71d61

Browse files
author
Roland Hedberg
committed
Merge branch 'master' of https://github.com/rohe/pyjwkest
2 parents c9f4206 + f3c2feb commit 4b71d61

File tree

3 files changed

+32
-2
lines changed

3 files changed

+32
-2
lines changed

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
*.pyc
22
*.egg-info
33
_files
4+
certs
5+
.vagrant
6+
Vagrantfile
47
build
58
dist
69
tests/debug_*.py
7-
.idea
10+
.tox
11+
.idea

.travis.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
language: python
2+
python: "2.7"
3+
4+
env:
5+
- TOX_ENV=py27
26

37
python:
48
- "2.7"
59

610
install:
11+
- pip install -U tox
712
- sudo apt-get -qq install libgmp-dev
813
- pip install -e .
914

1015
script:
11-
- ./setup.py test
16+
- tox -e $TOX_ENV

tox.ini

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Tox (http://tox.testrun.org/) is a tool for running tests
2+
# in multiple virtualenvs. This configuration file will run the
3+
# test suite on all supported python versions. To use it, "pip install tox"
4+
# and then run "tox" from this directory.
5+
6+
[tox]
7+
envlist = py27
8+
#, py34
9+
10+
[testenv]
11+
deps =
12+
pytest
13+
pycrypto
14+
requests
15+
commands = python setup.py test
16+
17+
[testenv:py27]
18+
basepython = python2.7
19+
20+
[testenv:py34]
21+
basepython = python3.4

0 commit comments

Comments
 (0)