Merge pull request #116 from vintasoftware/bugfix/upgrade-django-anymail

Upgrade django anymail
vintasoftware · Jan 11, 2019 · 85cb5e4 · 85cb5e4
2 parents 26d66b1 + f19c606
commit 85cb5e4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,7 +13,6 @@ env:
   - TOX_ENV=py27-django19
   - TOX_ENV=py35-django18
   - TOX_ENV=py34-django18
-  - TOX_ENV=py33-django18
   - TOX_ENV=py27-django18
 
 install:

diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1 @@
 -r tox-requirements.txt
-Django==1.11
diff --git a/tox-requirements.txt b/tox-requirements.txt
@@ -1,10 +1,10 @@
-django-anymail==0.5
+django-anymail==3.0
 django-pytest==0.2.0
 django-render-block==0.5
 html2text==2016.5.29
 mock==2.0.0
-pytest==2.9.2
-pytest-django==2.9.1
-pytest-pythonpath==0.7
+pytest==4.1.0
+pytest-django==3.4.5
+pytest-pythonpath==0.7.3
 six==1.10.0
 tox==2.3.1
diff --git a/tox.ini b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 envlist =
     py27-{flake8},
-    {py27,py33,py34,py35,py36}-django18,
+    {py27,py34,py35,py36}-django18,
     {py27,py34,py35,py36}-django{19},
     {py27,py34,py35,py36}-django{110}
     {py27,py34,py35,py36}-django{111}