Merge pull request #38 from nickatnight/master

Merging 'master' into master
Tivix · Apr 3, 2020 · c2d10c5 · c2d10c5
2 parents ca47ab0 + 3fa18d0
commit c2d10c5
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,21 +4,39 @@ python:
   - 3.4
   - 3.5
   - 3.6
+  - 3.7
 env:
   - DJANGO=1.8.*
   - DJANGO=1.9.*
   - DJANGO=1.10.*
   - DJANGO=1.11.*
   - DJANGO=2.0.*
   - DJANGO=2.1.*
+  - DJANGO=2.2.*
 matrix:
   exclude:
     - python: 2.7
       env: DJANGO=2.0.*
     - python: 2.7
       env: DJANGO=2.1.*
+    - python: 2.7
+      env: DJANGO=2.2.*
     - python: 3.4
       env: DJANGO=2.1.*
+    - python: 3.4
+      env: DJANGO=2.2.*
+    - python: 3.6
+      env: DJANGO=1.8.*
+    - python: 3.6
+      env: DJANGO=1.9.*
+    - python: 3.6
+      env: DJANGO=1.10.*
+    - python: 3.7
+      env: DJANGO=1.8.*
+    - python: 3.7
+      env: DJANGO=1.9.*
+    - python: 3.7
+      env: DJANGO=1.10.*
 install:
   - pip install -q Django==$DJANGO
   - pip install coveralls

diff --git a/README.md b/README.md
@@ -14,12 +14,13 @@ 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         | 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: |
+|            | Django 1.8         | Django 1.9         | Django 1.10        | Django 1.11        | Django 2.0         | Django 2.1         | Django 2.2         |
+| --         | --                 | --                 | --                 | --                 | --                 | --                 | --                 |
+| 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: | :heavy_check_mark: |
+| Python 3.6 |                    |                    |                    | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
+| Python 3.7 |                    |                    |                    | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 
 To install:
 ```python

diff --git a/setup.py b/setup.py
@@ -21,7 +21,7 @@
 
 setup(
     name='django_spam',
-    version='0.3.2',
+    version='0.4.0',
     author='Nick Kelly',
     author_email='[email protected]',
     url='http://github.com/Tivix/django-spam',
@@ -42,6 +42,8 @@
         'Framework :: Django :: 1.9',
         'Framework :: Django :: 1.10',
         'Framework :: Django :: 2.0',
+        'Framework :: Django :: 2.1',
+        'Framework :: Django :: 2.2',
         'Intended Audience :: Developers',
         'Intended Audience :: System Administrators',
         'Operating System :: OS Independent',