Merge pull request #19 from dipcode-software/feat/ci

srtab · web-flow · commit 6c206113e0b6 · 2017-09-15T19:25:07.000+01:00
Added support to python 3 and configured ci to run tests with all pyt…
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,46 @@
+sudo: false
 language: python
+
 python:
- - 2.7
-sudo: false
+  - "2.7"
+  - "3.4"
+  - "3.5"
+  - "3.6"
+
+env:
+  matrix:
+   - django19
+   - django110
+   - django111
+   - djangomaster
+
+matrix:
+  fast_finish: true
+  include:
+    - python: "3.4"
+      env: flake8
+  exclude:
+    - python: "2.7"
+      env: djangomaster
+    - python: "3.6"
+      env: django19
+    - python: "3.6"
+      env: django111
+  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
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -2,7 +2,7 @@
 
 We'd like to thank the following people for their contributions.
 
-- Paulo Truta <jpt@eurotux.com>
+- Paulo Truta
 - Rui Freitas <a72399@alunos.uminho.pt>
 - Sandro Rodrigues <srtabs@gmail.com>
 - Tiago Brito <tiago.brito3@gmail.com>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,5 +4,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## 0.1.0 - 2017-09-13
+## [0.1.1] - 2017-09-15
+### Added
+- Support to python 3.4, 3.5 and 3.6 and django 1.9, 1.10 and 1.11.
+
+## [0.1.0] - 2017-09-13
 - First release on PyPi
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,4 +1,7 @@
+include AUTHORS.md
+include CHANGELOG.md
+include CODE_OF_CONDUCT.md
 include LICENSE
 include MANIFEST.in
-include README.md
+include README.rst
 recursive-include cbmail/templates *
diff --git a/README.rst b/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
diff --git a/cbmail/__init__.py b/cbmail/__init__.py
@@ -1,3 +1,3 @@
 default_app_config = 'cbmail.apps.CBMAilConfig'
 
-__version__ = '0.1.0'
+__version__ = '0.1.1'
diff --git a/cbmail/tests/test_base.py b/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(
diff --git a/requirements/tests.txt b/requirements/tests.txt
diff --git a/setup.cfg b/setup.cfg
diff --git a/setup.py b/setup.py
@@ -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,
diff --git a/tox.ini b/tox.ini
@@ -1,38 +1,23 @@
 [tox]
 skipsdist = True
-envlist = py27,flake8
+envlist =
+    py{27,34,35}-django{19,110,111},
+    py{35,36}-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
+    django19: Django>=1.9,<1.10
+    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

-Original file line number
+Diff line change
 We'd like to thank the following people for their contributions.
 -- Paulo Truta <[email protected]>
 +- Paulo Truta
 - Rui Freitas <[email protected]>
 - Sandro Rodrigues <[email protected]>
 - Tiago Brito <[email protected]>
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`default_app_config = 'cbmail.apps.CBMAilConfig'`
`2`	`2`
`3`		`-__version__ = '0.1.0'`
	`3`	`+__version__ = '0.1.1'`