Skip to content

Commit

Permalink
Fix missed dependency. Fixes #145 (#146)
Browse files Browse the repository at this point in the history
* Fix missed dependency. Fixes #145

* Fix builds

* Change interpreter for PyPy3

* Change interpreter for PyPy3

* Try 5.9.0

* Add allow_failures

* Restore build
  • Loading branch information
Stranger6667 committed Nov 8, 2017
1 parent 0061b07 commit d593acb
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 7 deletions.
16 changes: 10 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ matrix:
- python: 3.5
env:
- TOX_ENV=lint
- python: 3.5
- python: 2.6
env:
- TOX_ENV=py26
- python: 3.5
env:
- TOX_ENV=py27
- python: 3.5
- python: 3.2
env:
- TOX_ENV=py32
- python: 3.5
- python: 3.3
env:
- TOX_ENV=py33
- python: 3.5
Expand All @@ -25,15 +25,19 @@ matrix:
- python: 3.6
env:
- TOX_ENV=py36
- python: 3.5
- python: pypy
env:
- TOX_ENV=pypy
- python: 3.5
- python: pypy3.5-5.8.0
env:
- TOX_ENV=pypy3
- python: 3.5
env:
- TOX_ENV=jython
allow_failures:
- python: pypy3.5-5.8.0
env:
- TOX_ENV=pypy3
fast_finish: true
install:
- if [ $TOX_ENV = "py32" ]; then travis_retry pip install "virtualenv<14.0.0"; fi
Expand All @@ -45,4 +49,4 @@ before_script:
script:
- tox -e $TOX_ENV
after_success:
- bash <(curl -s https://codecov.io/bash)
- bash <(curl -s https://codecov.io/bash)
4 changes: 4 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@
install_requires = ['requests']


if sys.version_info[:2] <= (3, 2):
install_requires.append('mock')


with open('README.rst') as file:
long_description = file.read()

Expand Down
2 changes: 1 addition & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
from contextlib import contextmanager

import pytest

from betamax import Betamax
from betamax_serializers import pretty_json

from postmarker.core import PostmarkClient
from postmarker.models.emails import Delivery

Expand Down

0 comments on commit d593acb

Please sign in to comment.