Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes for Travis. #31

Merged
merged 1 commit into from Feb 20, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
@@ -1,5 +1,6 @@
services:
- redis-server
dist: xenial
sudo: false
language: python
python:
Expand Down
1 change: 1 addition & 0 deletions tests/constraints/flask-1.0.txt
@@ -0,0 +1 @@
Flask<2.0
2 changes: 1 addition & 1 deletion tests/requirements.txt
Expand Up @@ -7,7 +7,7 @@ pytest-django
pytest-mock
pytest-pythonpath
mock
redis
redis<3.2.0
django-redis
fakeredis
jsonschema
Expand Down
14 changes: 7 additions & 7 deletions tox.ini
Expand Up @@ -2,15 +2,14 @@
usedevelop = True
minversion = 1.8
envlist =
lint,
py36-lint,
py36-dj{18,19,110,111,20}-docs,
# the version matrix according to the Django docs:
# https://docs.djangoproject.com/en/2.0/faq/install/#what-python-version-can-i-use-with-django
docs-py35-dj{18,19,110,111,20},
tests-py{27,34,35}-dj18,
tests-py{27,34,35}-dj{19,110},
tests-py{27,34,35,36}-dj111,
tests-py{34,35,36}-dj20,
tests-py{27,34,35,36}-fl{011,012}
py{27,34,35}-dj{18,19,110}-tests,
py{27,34,35,36}-dj111-tests,
py{34,35,36}-dj20-tests,
py{27,34,35,36}-fl{011,012,10}-tests,

[testenv]
basepython =
Expand All @@ -30,6 +29,7 @@ deps =
dj111: -ctests/constraints/django-1.11.txt
fl011: -ctests/constraints/flask-0.11.txt
fl012: -ctests/constraints/flask-0.12.txt
fl10: -ctests/constraints/flask-1.0.txt
commands =
python --version
tests: pytest {posargs:tests}
Expand Down