Skip to content

Commit 6bd46e2

Browse files
authored
Support Django 3.2 and drop Django 1.11, 2.0, and 2.1. (makinacorpus#320)
* Add to tox and travis grids. * Add new setting.
1 parent b38dd58 commit 6bd46e2

File tree

4 files changed

+21
-39
lines changed

4 files changed

+21
-39
lines changed

.github/workflows/python-app.yml

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,18 @@ jobs:
1515
runs-on: ubuntu-latest
1616
strategy:
1717
matrix:
18-
django_version: [ '1.11', '2.0', '2.1', '2.2', '3.0', '3.1' ]
18+
django_version: [ '2.2', '3.0', '3.1', '3.2' ]
1919
python_version: [ '3.5', '3.6', '3.7', '3.8', '3.9' ]
2020
database: [ 'postgres' ]
2121
exclude:
22-
- django_version: '1.11'
23-
python_version: '3.8'
24-
- django_version: '1.11'
25-
python_version: '3.9'
26-
27-
- django_version: '2.0'
28-
python_version: '3.8'
29-
- django_version: '2.0'
30-
python_version: '3.9'
31-
32-
- django_version: '2.1'
33-
python_version: '3.8'
34-
- django_version: '2.1'
35-
python_version: '3.9'
36-
3722
- django_version: '3.0'
3823
python_version: '3.5'
3924

4025
- django_version: '3.1'
4126
python_version: '3.5'
27+
28+
- django_version: '3.1'
29+
python_version: '3.5'
4230
include:
4331
- django_version: '2.2'
4432
python_version: '3.7'
@@ -82,14 +70,9 @@ jobs:
8270
- name: Lint with flake8
8371
run: |
8472
flake8 --ignore=E501,W504 leaflet
85-
- name: Test Django >= 2.0
86-
if: matrix.django_version != '1.11'
73+
- name: Test
8774
run: |
8875
python -W error::DeprecationWarning -W error::PendingDeprecationWarning -m coverage run ./quicktest.py leaflet --db=${{ matrix.database }}
89-
- name: Test Django 1.11
90-
if: matrix.django_version == '1.11'
91-
run: |
92-
python -m coverage run ./quicktest.py leaflet --db=${{ matrix.database }}
9376
- name: Coverage
9477
if: ${{ success() }}
9578
run: |

CHANGES

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ CHANGELOG
66
0.27.2 (unreleased)
77
-------------------
88

9-
- Support Django 3.1.
10-
- tranlate to persian #313
9+
- Support Django 3.1 and 3.2.
10+
- Drop support for Django 1.11, 2.0, and 2.1.
11+
- tranlate to persian #313
1112

1213
0.27.1 (2020-07-31)
1314
-------------------

quicktest.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ def run_tests(self):
6464
'django.contrib.messages.middleware.MessageMiddleware',
6565
'django.contrib.sessions.middleware.SessionMiddleware',
6666
],
67+
"SECRET_KEY": "insecure-secret-key",
6768
'TEMPLATES': [{
6869
'BACKEND': 'django.template.backends.django.DjangoTemplates',
6970
'OPTIONS': {
@@ -75,6 +76,8 @@ def run_tests(self):
7576
'APP_DIRS': True,
7677
}],
7778
}
79+
if django.VERSION >= (3, 2):
80+
conf["DEFAULT_AUTO_FIELD"] = "django.db.models.BigAutoField"
7881
if 'SPATIALITE_LIBRARY_PATH' in os.environ:
7982
# If you get SpatiaLite-related errors, refer to this document
8083
# to find out the proper SPATIALITE_LIBRARY_PATH value

tox.ini

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,20 @@
11
[tox]
22
envlist =
3-
{py34,py35,py36,py37}-django111,
4-
{py34,py35,py36,py37}-django20,
5-
{py35,py36,py37}-django21,
6-
{py35,py36,py37}-django22,
7-
{py36,py37,py38}-django30,
8-
{py36,py37,py38}-django31,
9-
{py36,py37,py38}-djangomaster
3+
{py35,py36,py37,py38,py39}-django22
4+
{py36,py37,py38,py39}-django30
5+
{py36,py37,py38,py39}-django31
6+
{py36,py37,py38,py39}-django32
7+
{py36,py37,py38,py39}-djangomain
108

119
[testenv]
1210
commands = python -W error::DeprecationWarning -W error::PendingDeprecationWarning -m coverage run ./quicktest.py leaflet --db={env:DATABASE:}
1311
deps =
14-
django111: Django>=1.11,<2.0
15-
django20: Django>=2.0,<2.1
16-
django21: Django>=2.1,<2.2
17-
django22: Django>=2.2,<3.0
18-
django30: Django>=3.0,<3.1
19-
django30: Django>=3.1,<3.2
20-
djangomaster: https://github.com/django/django/archive/master.tar.gz
12+
django22: Django~=2.2
13+
django30: Django~=3.0
14+
django31: Django~=3.1
15+
django32: Django~=3.2
16+
djangomain: https://github.com/django/django/archive/main.tar.gz
2117
postgres: psycopg2-binary
22-
argparse
2318
coverage
2419
passenv = DATABASE SPATIALITE_LIBRARY_PATH
2520

0 commit comments

Comments
 (0)