Skip to content

Commit

Permalink
Merge 74b8bb2 into abf137e
Browse files Browse the repository at this point in the history
  • Loading branch information
JonathanWillitts committed Apr 29, 2021
2 parents abf137e + 74b8bb2 commit 6aa28ec
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 5 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ jobs:
- python: 3.8
dist: xenial
sudo: true
- python: 3.9
dist: xenial
sudo: true

install:
- pip install -U packaging # fix for Python3.4 build
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ v1.0.7 - Unreleased
===================

* Add tests for Django 3.1.
* Add tests for Django 3.2 LTS.
* Test on Python 3.9 (for Django versions 2.2 LTS to present (3.2 LTS))
* Fix failing tests for Django 2.2.
* Fix failing lint test


v1.0.6 - 23/04/2020
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ Originally based on: `Django snippet 2484 <http://djangosnippets.org/snippets/24
Supported versions
==================

* Django 3.1, 3.0, 2.2, 2.1, 2.0, 1.11, 1.10, 1.9, 1.8
* Python 3.8, 3.7, 3.6, 3.5, 3.4, 2.7
* Django 3.2, 3.1, 3.0, 2.2, 2.1, 2.0, 1.11, 1.10, 1.9, 1.8
* Python 3.9, 3.8, 3.7, 3.6, 3.5, 3.4, 2.7


Installation
Expand Down
2 changes: 2 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
'Framework :: Django :: 2.2',
'Framework :: Django :: 3.0',
'Framework :: Django :: 3.1',
'Framework :: Django :: 3.2',
'Intended Audience :: Developers',
'License :: OSI Approved :: ISC License (ISCL)',
'Natural Language :: English',
Expand All @@ -53,5 +54,6 @@
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
],
)
6 changes: 6 additions & 0 deletions tests/conftest.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import random

from django.conf import settings


Expand Down Expand Up @@ -34,4 +36,8 @@ def pytest_configure():
],
},
}],
SECRET_KEY=''.join(
random.choice("abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*(-_=+)")
for _ in range(50)
),
)
9 changes: 6 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
[tox]
envlist =
{py38,py37,py36}-django31,
{py38,py37,py36}-django30,
{py38,py37,py36,py35}-django22,
{py39,py38,py37,py36}-django32,
{py39,py38,py37,py36}-django31,
{py39,py38,py37,py36}-django30,
{py39,py38,py37,py36,py35}-django22,
{py37,py36,py35}-django21,
{py37,py36,py35,py34}-django20,
{py37,py36,py35,py34,py27}-{django111},
Expand All @@ -17,8 +18,10 @@ deps =
django111: Django>=1.11,<2.0
django20: Django>=2.0,<2.1
django21: Django>=2.1,<2.2
django22: Django>=2.2,<2.3
django30: Django>=3.0,<3.1
django31: Django>=3.1,<3.2
django32: Django>=3.2,<3.3
coverage
pytest
pytest-cov
Expand Down

0 comments on commit 6aa28ec

Please sign in to comment.