Skip to content

Commit

Permalink
Add target for python 3.8 & cleanup travis script
Browse files Browse the repository at this point in the history
  • Loading branch information
joehybird committed Jan 27, 2020
1 parent b2ffaae commit 0caf5d4
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 39 deletions.
52 changes: 15 additions & 37 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,42 +1,20 @@
dist: xenial
dist: bionic
sudo: true
language: python
matrix:
include:
# Python version is just for the look on travis.
- python: 2.7
env: TOX_ENV=py27-django111

- python: 3.5
env: TOX_ENV=py35-django111
- python: 3.5
env: TOX_ENV=py35-django20
- python: 3.5
env: TOX_ENV=py35-django21
- python: 3.5
env: TOX_ENV=py35-django22

- python: 3.6
env: TOX_ENV=py36-django111
- python: 3.6
env: TOX_ENV=py36-django20
- python: 3.6
env: TOX_ENV=py36-django21
- python: 3.6
env: TOX_ENV=py36-django22

- python: 3.7
env: TOX_ENV=py37-django20
- python: 3.7
env: TOX_ENV=py37-django21
- python: 3.7
env: TOX_ENV=py37-django22
- python: 3.7
env: TOX_ENV=py37-djangostable

- env: TOX_ENV=lint
python:
- 2.7
- 3.5
- 3.6
- 3.7
- 3.8
stages:
- lint
- test
jobs:
include:
- { stage: lint, env: TOXENV=flake8, python: 3.6 }

script:
- tox -e $TOX_ENV
- tox
install:
- pip install tox
- pip install tox tox-travis
11 changes: 9 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,16 @@
envlist =
py{27,35,36}-django111
py{35,36,37}-django{20,21,22}
py37-djangostable
py{37,38}-djangostable
lint

[tox:travis]
2.7 = py27
3.5 = py35
3.6 = py36
3.7 = py37
3.8 = py38

[testenv]
setenv=PYTHONWARNINGS=d
deps =
Expand All @@ -18,7 +25,7 @@ commands =
python --version
pip install -e .
pip freeze
coverage run --branch --source=mail_factory demo/manage.py test mail_factory
coverage run --branch --source=mail_factory demo/manage.py test {posargs:mail_factory}
coverage report -m --omit=mail_factory/test*

[testenv:lint]
Expand Down

0 comments on commit 0caf5d4

Please sign in to comment.