Skip to content

Commit 68a0de7

Browse files
authored
Merge pull request #157 from mpdavis/version-3.1.0
Bump version to 3.1.0
2 parents 64aaa8a + 2b51a98 commit 68a0de7

File tree

3 files changed

+2
-24
lines changed

3 files changed

+2
-24
lines changed

.travis.yml

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,6 @@ matrix:
2121
env: TOXENV=py27-pycrypto-norsa
2222
- python: 2.7
2323
env: TOXENV=py27-compatibility
24-
# CPython 3.4
25-
- python: 3.4
26-
env: TOXENV=py34-base
27-
- python: 3.4
28-
env: TOXENV=py34-cryptography-only
29-
- python: 3.4
30-
env: TOXENV=py34-pycryptodome-norsa
31-
- python: 3.4
32-
env: TOXENV=py34-pycrypto-norsa
33-
- python: 3.4
34-
env: TOXENV=py34-compatibility
3524
# CPython 3.5
3625
- python: 3.5
3726
env: TOXENV=py35-base
@@ -77,17 +66,6 @@ matrix:
7766
env: TOXENV=py37-compatibility
7867
dist: xenial
7968
sudo: true
80-
# PyPy 5.3.1
81-
- python: pypy-5.3.1
82-
env: TOXENV=pypy-base
83-
- python: pypy-5.3.1
84-
env: TOXENV=pypy-cryptography-only
85-
- python: pypy-5.3.1
86-
env: TOXENV=pypy-pycryptodome-norsa
87-
- python: pypy-5.3.1
88-
env: TOXENV=pypy-pycrypto-norsa
89-
- python: pypy-5.3.1
90-
env: TOXENV=pypy-compatibility
9169
# PyPy 3.5 (5.10.1?)
9270
- python: pypy3.5
9371
env: TOXENV=pypy-base

jose/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
__version__ = "3.0.1"
2+
__version__ = "3.1.0"
33
__author__ = 'Michael Davis'
44
__license__ = 'MIT'
55
__copyright__ = 'Copyright 2016 Michael Davis'

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[tox]
22
minversion = 3.4.0
33
envlist =
4-
py{27,34,35,36,py}-{base,cryptography-only,pycryptodome-norsa,pycrypto-norsa,compatibility},
4+
py{27,35,36,py}-{base,cryptography-only,pycryptodome-norsa,pycrypto-norsa,compatibility},
55
flake8
66
skip_missing_interpreters = True
77

0 commit comments

Comments
 (0)