Skip to content

Commit

Permalink
Merge pull request #9 from nickatnight/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
nickatnight committed Apr 8, 2019
2 parents 1d6b84b + 990defe commit 078ac5e
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 7 deletions.
5 changes: 5 additions & 0 deletions .travis.yml
Expand Up @@ -10,10 +10,15 @@ env:
- DJANGO=1.10.*
- DJANGO=1.11.*
- DJANGO=2.0.*
- DJANGO=2.1.*
matrix:
exclude:
- python: 2.7
env: DJANGO=2.0.*
- python: 2.7
env: DJANGO=2.1.*
- python: 3.4
env: DJANGO=2.1.*
install:
- pip install -q Django==$DJANGO
- pip install coveralls
Expand Down
12 changes: 6 additions & 6 deletions README.md
Expand Up @@ -14,12 +14,12 @@ for that matter) try and access them, they will get redirected...
[![Coverage Status](https://coveralls.io/repos/github/nickatnight/django-spam/badge.svg?branch=master)](https://coveralls.io/github/nickatnight/django-spam?branch=master)


| | Django 1.8 | Django 1.9 | Django 1.10 | Django 1.11 | Django 2.0 |
| -- | -- | -- | -- | -- | -- |
| Python 2.7 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | |
| Python 3.4 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
| Python 3.5 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
| Python 3.6 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
| | Django 1.8 | Django 1.9 | Django 1.10 | Django 1.11 | Django 2.0 | Django 2.1 |
| -- | -- | -- | -- | -- | -- | -- |
| Python 2.7 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | |
| Python 3.4 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | |
| Python 3.5 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
| Python 3.6 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |

To install:
```python
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -21,7 +21,7 @@

setup(
name='django_spam',
version='0.3.1',
version='0.3.2',
author='Nick Kelly',
author_email='nick.kelly@tivix.com',
url='http://github.com/Tivix/django-spam',
Expand Down

0 comments on commit 078ac5e

Please sign in to comment.