Skip to content

Commit d6de18b

Browse files
committed
update readme setup, and test matrix
1 parent e4df1bc commit d6de18b

File tree

7 files changed

+20
-20
lines changed

7 files changed

+20
-20
lines changed

.travis.yml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,16 @@ language: python
22
cache: pip
33
dist: xenial
44
python:
5-
- 2.7
65
- 3.6
6+
- 3.7
7+
- 3.8
78
env:
89
- DJANGO_VERSION=1.11.20
910
- DJANGO_VERSION=2.1.8
1011
- DJANGO_VERSION=2.2
1112
- DJANGO_VERSION=1.11.20 DRF_VERSION=3.9.2
1213
- DJANGO_VERSION=2.1.8 DRF_VERSION=3.9.2
1314
- DJANGO_VERSION=2.2 DRF_VERSION=3.9.2
14-
matrix:
15-
exclude:
16-
- python: 2.7
17-
env: DJANGO_VERSION=2.1.8
18-
- python: 2.7
19-
env: DJANGO_VERSION=2.1.8 DRF_VERSION=3.9.2
20-
- python: 2.7
21-
env: DJANGO_VERSION=2.2
22-
- python: 2.7
23-
env: DJANGO_VERSION=2.2 DRF_VERSION=3.9.2
2415
install:
2516
- pip install -r .travis/requirements.txt
2617
- pip install --upgrade "Django==${DJANGO_VERSION}"

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/)
55
and this project adheres to [Semantic Versioning](http://semver.org/).
66

7+
## [2.2.0] - 2019-12-XX
8+
### Changes
9+
- Dropped Python 2.7 support.
10+
- Added Python 3.8 support.
11+
- Added official support for Django 3.0
12+
- Added official support for Django Rest Framework 3.10.
13+
714
## [2.1.6] - 2019-04-02
815
### Changes
916
- Added official support for Django 2.2 LTS.

README.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ Requirements
3131

3232
This module is tested and known to work with:
3333

34-
* Python 2.7, 3.6, 3.7
35-
* Django 1.11, 2.1, 2.2
34+
* Python 3.6, 3.7, 3.8
35+
* Django 1.11, 2.1, 2.2, 3.0
3636
* Hashids 1.2
3737
* Django REST Framework 3.9
3838

@@ -73,6 +73,7 @@ Migrate your database
7373
7474
Upgrading
7575
------------
76+
**Version 2.2 follows Django 3.0 and drops support for Python 2.7.**
7677

7778
**Potentially breaking changes in 2.0.0** depending on your usage and configuration, specifically if you rely on
7879
integer lookups (now off by default) or exceptions for invalid lookup values.

runtests.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/usr/bin/env python
2-
from __future__ import print_function, unicode_literals
32
import os
43
import sys
54
import warnings

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# This flag says that the code is written to work on both Python 2 and Python
33
# 3. If at all possible, it is good practice to do this. If you cannot, you
44
# will need to generate wheels for each Python version that you support.
5-
universal=1
5+
universal=0

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,17 +87,17 @@ def get_version(package):
8787

8888
# Specify the Python versions you support here. In particular, ensure
8989
# that you indicate whether you support Python 2, Python 3 or both.
90-
'Programming Language :: Python :: 2',
91-
'Programming Language :: Python :: 2.7',
9290
'Programming Language :: Python :: 3',
9391
'Programming Language :: Python :: 3.6',
9492
'Programming Language :: Python :: 3.7',
93+
'Programming Language :: Python :: 3.8',
9594

9695
# Django
9796
'Framework :: Django',
9897
'Framework :: Django :: 1.11',
9998
'Framework :: Django :: 2.1',
10099
'Framework :: Django :: 2.2',
100+
'Framework :: Django :: 3.0',
101101
],
102102

103103
# What does your project relate to?

tox.ini

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
# and then run "tox" from this directory.
55

66
[tox]
7-
envlist = py{27,36}-django111-{rest,norest},
8-
py36-django{21,22}-{rest,norest},
9-
py37-django{21,22}-{rest,norest}
7+
envlist = py36-django111-{rest,norest},
8+
py36-django{21,22,30}-{rest,norest},
9+
py37-django{21,22,30}-{rest,norest}:
10+
py38-django{21,22,30}-{rest,norest}:
1011

1112
[testenv]
1213
commands = python runtests.py
@@ -15,4 +16,5 @@ deps =
1516
django111: Django~=1.11.20
1617
django21: Django~=2.1.8
1718
django22: Django~=2.2
19+
django30: Django~=3.0
1820
rest: djangorestframework==3.9.2

0 commit comments

Comments
 (0)