Skip to content

Commit

Permalink
Merge pull request #82 from peopledoc/drop-dj-18-110
Browse files Browse the repository at this point in the history
Drop Django 1.8/1.10 support
  • Loading branch information
sheb committed May 31, 2018
2 parents 87202ee + a581928 commit 63559f9
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 13 deletions.
8 changes: 0 additions & 8 deletions .travis.yml
Expand Up @@ -2,17 +2,9 @@ language: python
matrix:
include:
# Python version is just for the look on travis.
- python: 2.7
env: TOX_ENV=py27-django18
- python: 2.7
env: TOX_ENV=py27-django110
- python: 2.7
env: TOX_ENV=py27-django111

- python: 3.5
env: TOX_ENV=py35-django18
- python: 3.5
env: TOX_ENV=py35-django110
- python: 3.5
env: TOX_ENV=py35-django111
- python: 3.5
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG
Expand Up @@ -9,6 +9,8 @@ Changelog
- Drop Django 1.9 support
- Add Python 3.6 support
- Add Django 2.0 support
- Drop Django 1.8 support
- Drop Django 1.10 support


0.20 (2017-10-12)
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Expand Up @@ -15,7 +15,7 @@ Django Mail Factory lets you manage your email in a multilingual project.
* Authors: Rémy Hubscher and `contributors
<https://github.com/peopledoc/django-mail-factory/graphs/contributors>`_
* Licence: BSD
* Compatibility: Django 1.8, 1.9, 1.10, 1.11, python2.7, python3.4 and python3.5
* Compatibility: Django 1.11, 2.0, python2.7, python3.5 and python3.6
* Project URL: https://github.com/peopledoc/django-mail-factory
* Documentation: http://django-mail-factory.rtfd.org/

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -28,8 +28,8 @@ def read_relative_file(filename):
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
],
keywords='django mail manager',
author='Rémy Hubscher',
Expand Down
3 changes: 0 additions & 3 deletions tox.ini
@@ -1,6 +1,5 @@
[tox]
envlist =
py{27,35}-django{18,110}
py{27,35,36}-django111
py{35,36}-django20
py36-djangostable
Expand All @@ -9,8 +8,6 @@ envlist =
[testenv]
changedir = ./demo
deps =
django18: Django>=1.8,<1.9
django110: Django>=1.10,<1.11
django111: Django>=1.11,<2.0
django20: Django>=2.0,<2.1
djangostable: Django
Expand Down

0 comments on commit 63559f9

Please sign in to comment.