Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support Django 3.1 #20

Merged
merged 3 commits into from
Jul 10, 2020
Merged

Support Django 3.1 #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
75e5b97
Run tests on Django 3.1.
clokep Jul 10, 2020
82bf230
Drop support for Django 1.11.
clokep Jul 10, 2020
5482bea
Remove some Python 2 syntax.
clokep Jul 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ Changelog
next (xxx)
==========

* Drop support for Django 2.1.
* Officially supports Django 3.0.
* Drop support for Django < 2.2.
* Officially supports Django 3.0, 3.1.
* Drop support for Python 2.7.
* Officially supports Python 3.8.

Expand Down
2 changes: 1 addition & 1 deletion README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Features
Requirements
============

Django Render Block supports Django 1.11, 2.2, and 3.0 on Python 3.5, 3.6, 3.7, and 3.8.
Django Render Block supports Django 2.2, 3.0, and 3.1 on Python 3.5, 3.6, 3.7, and 3.8.

Examples
========
Expand Down
2 changes: 1 addition & 1 deletion render_block/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
except ImportError:
# Most likely Jinja2 isn't installed, in that case just create a class since
# we always want it to be false anyway.
class Jinja2Template(object):
class Jinja2Template:
pass

from render_block.django import django_render_block
Expand Down
6 changes: 3 additions & 3 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

[tox]
envlist =
py{35,36,37,38}-django{111,22},
py{35,36,37,38}-django22,
# Django 3.0 requires Python 3.6.
py{36,37,38}-django{30,master}
py{36,37,38}-django{30,31,master}
skip_missing_interpreters = True

[testenv]
Expand All @@ -16,7 +16,7 @@ commands =
python manage.py test
deps =
Jinja2
django111: Django>=1.11,<2.0
django22: Django>=2.2,<2.3
django30: Django>=3.0,<3.1
django31: Django>=3.1b1,<3.2
djangomaster: https://codeload.github.com/django/django/zip/master