Added support to python 3 and configured ci to run tests with all python versions

Author: Sandro Rodrigues

.travis.yml

@@ -1,9 +1,43 @@
+sudo: false
 language: python
+
 python:
- - 2.7
-sudo: false
+  - "2.7"
+  - "3.4"
+  - "3.5"
+  - "3.6"
+
+env:
+  matrix:
+   - django110
+   - django111
+   - djangomaster
+
+matrix:
+  fast_finish: true
+  include:
+    - python: "3.4"
+      env: flake8
+  exclude:
+    - python: "2.7"
+      env: djangomaster
+    - python: "3.6"
+      env: django110
+  allow_failures:
+    - env: djangomaster
+
+cache:
+  directories:
+    - $HOME/.cache/pip
+    - $TRAVIS_BUILD_DIR/.tox
+
 install:
- - pip install tox
+  - pip install --upgrade pip wheel setuptools
+  - pip install coveralls codacy-coverage tox-travis
+
 script:
- - tox -e flake8
- - tox -e travis
+  - tox
+
+after_success:
+  - coveralls
+  - python-codacy-coverage -r coverage.xml

README.rst

@@ -1,7 +1,7 @@
 Django CBMail
 ================
 
-|Build Status| |Codacy Badge| |Coverage Status| |BCH compliance|
+|Pypi| |Build Status| |Codacy Badge| |Coverage Status| |BCH compliance|
 
 Django module to easily send templated emails in a DRY way using
 classes, just like Class Based Views.
@@ -84,6 +84,8 @@ projects and commercial products.
 .. _Settings reference: #settings-reference
 .. _License: #license
 
+.. |Pypi| image:: https://img.shields.io/pypi/v/django-cbmail.svg?style=flat-square
+   :target: https://pypi.python.org/pypi/django-cbmail
 .. |Build Status| image:: https://travis-ci.org/dipcode-software/django-cbmail.svg?branch=master
    :target: https://travis-ci.org/dipcode-software/django-cbmail
 .. |Codacy Badge| image:: https://api.codacy.com/project/badge/Grade/d01ebbe43c684d478cacc530e44633ad

cbmail/tests/test_base.py

@@ -17,7 +17,7 @@ class TestBaseObject(BaseMail):
 
     def get_attachments(self):
         f = NamedTemporaryFile()
-        f.write('unit test')
+        f.write(b'unit test')
         f.seek(0)
         attachment = open(f.name, 'rb')
         att = Attachment(

requirements/tests.txt

@@ -12,7 +12,7 @@
 # Package meta-data.
 VERSION = __import__("cbmail").__version__
 NAME = 'django-cbmail'
-DESCRIPTION = 'Django module to easily send templated emails. '
+DESCRIPTION = 'Django module to easily send templated emails in a DRY way'
 URL = 'https://github.com/dipcode-software/django-cbmail/'
 EMAIL = 'team@dipcode.com'
 AUTHOR = 'Dipcode'
@@ -83,12 +83,16 @@ class DevelopmentPublishCommand(PublishCommand):
     classifiers=[
         'Environment :: Web Environment',
         'Framework :: Django',
+        'Framework :: Django :: 1.10',
         'Framework :: Django :: 1.11',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
     ],
     cmdclass={
         'publish_dev': DevelopmentPublishCommand,

setup.py

@@ -1,38 +1,22 @@
 [tox]
 skipsdist = True
-envlist = py27,flake8
+envlist =
+    {py27,py34,py35}-django{110,111},
+    {py35,py36}-django{111,master},
+    flake8
 
 [testenv]
-deps = -r{toxinidir}/requirements/tests.txt
-commands = {envpython} runtests.py
-
-[testenv:flake8]
-deps = flake8
-commands = flake8 {toxinidir}/cbmail --exclude=*/migrations/*,*settings*
-
-[testenv:coverage]
-basepython=python2.7
-deps=
-    -r{toxinidir}/requirements/tests.txt
-    coverage
-setenv=
-    PYTHONWARNINGS=ignore
-commands=
-    coverage run runtests.py {posargs:}
-    coverage report
-    coverage erase
-
-[testenv:travis]
-passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
 deps =
-    -r{toxinidir}/requirements/tests.txt
     coverage
-    coveralls
-    codacy-coverage
-setenv =
-    PYTHONWARNINGS=ignore
-commands =
+    mock >= 2.0.0
+    django110: Django>=1.10,<1.11
+    django111: Django>=1.11,<2.0
+    djangomaster: https://github.com/django/django/archive/master.tar.gz
+commands=
     coverage run runtests.py {posargs:}
     coverage report
     coverage xml
-    coveralls
+
+[testenv:flake8]
+deps = flake8
+commands = flake8 {toxinidir}/cbmail