Skip to content

Restore djangomaster tests #795

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Mar 1, 2020
Merged

Restore djangomaster tests #795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2657e68
restore commented-out tests
n2ygk Mar 1, 2020
52b450b
explicit tox matrix to enable allowed failures
n2ygk Mar 1, 2020
a6ffd1e
Merge branch 'master' into restore_djangomaster_tests
n2ygk Mar 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 41 additions & 6 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,52 @@ dist: bionic

language: python

python:
- "3.8"
- "3.7"
- "3.6"
- "3.5"

cache:
directories:
- $HOME/.cache/pip
- $TRAVIS_BUILD_DIR/.tox

# Make sure to coordinate changes to envlist in tox.ini.
matrix:
allow_failures:
- env: TOXENV=py36-djangomaster
- env: TOXENV=py37-djangomaster
- env: TOXENV=py38-djangomaster

include:
- python: 3.7
env: TOXENV=py37-flake8
- python: 3.7
env: TOXENV=py37-docs

- python: 3.8
env: TOXENV=py38-django30
- python: 3.8
env: TOXENV=py38-django22
- python: 3.8
env: TOXENV=py38-django21
- python: 3.8
env: TOXENV=py38-djangomaster

- python: 3.7
env: TOXENV=py37-django30
- python: 3.7
env: TOXENV=py37-django22
- python: 3.7
env: TOXENV=py37-django21
- python: 3.7
env: TOXENV=py37-djangomaster

- python: 3.6
env: TOXENV=py36-django22
- python: 3.6
env: TOXENV=py36-django21

- python: 3.5
env: TOXENV=py35-django22
- python: 3.5
env: TOXENV=py35-django21

install:
- pip install coveralls tox tox-travis

Expand Down
8 changes: 4 additions & 4 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ envlist =
py37-django{30,22,21},
py36-django{22,21},
py35-django{22,21},
# FIXME: something is broken in DRF integration, enable once fixed
# py38-djangomaster,
# py37-djangomaster,
# py36-djangomaster,
py38-djangomaster,
py37-djangomaster,
py36-djangomaster,

[pytest]
django_find_project = false
Expand Down Expand Up @@ -51,6 +50,7 @@ commands =
deps =
flake8
flake8-isort
# TODO: restore this:
# flake8-quotes

[coverage:run]
Expand Down