Skip to content

Commit

Permalink
Merge pull request #14 from hawi74/update_deps
Browse files Browse the repository at this point in the history
Update supported environments
  • Loading branch information
zefciu committed Jan 10, 2019
2 parents bcadd81 + 53671ec commit 68e6897
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 24 deletions.
27 changes: 10 additions & 17 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,38 +5,31 @@ python:
- "2.7"
- "3.4"
- "3.5"
- "3.6"
- "3.7-dev"

env:
- DJANGO=1.8
- DJANGO=1.11
- DJANGO=2.0
- DJANGO=2.1
- DJANGO=master

matrix:
fast_finish: true
include:
- python: "3.6"
env: DJANGO=1.11
- python: "3.6"
env: DJANGO=2.0
- python: "3.6"
env: DJANGO=master
- python: "3.7-dev"
env: DJANGO=1.11
- python: "3.7-dev"
env: DJANGO=2.0
- python: "3.7-dev"
env: DJANGO=master
exclude:
- python: "2.7"
env: DJANGO=2.0
- python: "2.7"
env: DJANGO=2.1
- python: "2.7"
env: DJANGO=master
- python: "3.4"
env: DJANGO=2.1
- python: "3.4"
env: DJANGO=master
- python: "2.7"
env: DJANGO=2.0
allow_failures:
- python: "3.7-dev"
- env: DJANGO=master
- python: "3.7-dev"

install:
- travis_retry pip install -U tox-travis
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ def get_packages(package):
url='https://github.com/sunscrapers/django-templated-mail',
classifiers=[
'Development Status :: 5 - Production/Stable',
'Framework :: Django :: 1.8',
'Framework :: Django :: 1.11',
'Framework :: Django :: 2.0',
'Framework :: Django :: 2.1',
'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License',
'Operating System :: OS Independent',
Expand Down
11 changes: 5 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,17 @@ python_paths = .

[tox]
envlist =
{py27,py34,py35}-django18,
{py27,py34,py35,py36,py37}-django111,
{py34,py35,py36,py37}-django20,
py{34,35,36,37}-djangomaster
py{27,34,35,36,37}-django111
py{34,35,36,37}-django20
py{35,36,37}-django{21,master}
flake8


[travis:env]
DJANGO =
1.8: django18
1.11: django111
2.0: django20
2.1: django21
master: djangomaster


Expand All @@ -27,9 +26,9 @@ basepython =
py36: python3.6
py37: python3.7
deps =
django18: django>=1.8,<1.9
django111: django>=1.11,<2.0
django20: django>=2.0,<2.1
django21: django>=2.1,<2.2
djangomaster: git+git://github.com/django/django.git
py27: mock
-rrequirements/test
Expand Down

0 comments on commit 68e6897

Please sign in to comment.