Skip to content

Commit 959465a

Browse files
authored
Merge pull request #37 from escaped/feat/django3.x
feat: add support for django 3.x
2 parents 2047084 + 6722202 commit 959465a

File tree

6 files changed

+74
-7
lines changed

6 files changed

+74
-7
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
### Added
11+
12+
* support for django 3.x
13+
1014
### Changed
1115

1216
* dropped support for python 3.5

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ class ArticleInline(InlineActionsMixin,
8585
model = Article
8686
inline_actions = []
8787

88-
def has_add_permission(self):
88+
def has_add_permission(self, request, obj=None):
8989
return False
9090

9191

poetry.lock

Lines changed: 61 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ packages = [
3232

3333
[tool.poetry.dependencies]
3434
python = ">=3.6.1, <4.0"
35+
django = ">=2.0"
3536

3637
[tool.poetry.dev-dependencies]
3738
autoflake = "^1.4"

test_proj/blog/admin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ class ArticleInline(
9898
'status',
9999
)
100100

101-
def has_add_permission(self, request):
101+
def has_add_permission(self, request, obj=None):
102102
return False
103103

104104

tox.ini

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ python =
99
skipsdist = True
1010
isolated_build = True
1111
envlist =
12-
py36-{2.0,2.1,2.2}
13-
py37-{2.0,2.1,2.2}
14-
py38-{2.0,2.1,2.2}
15-
py39-{2.0,2.1,2.2}
12+
py36-{2.0,2.1,2.2,3.0,3.1}
13+
py37-{2.0,2.1,2.2,3.0,3.1}
14+
py38-{2.0,2.1,2.2,3.0,3.1}
15+
py39-{2.0,2.1,2.2,3.0,3.1}
1616

1717
[testenv]
1818
skip_install = True
@@ -25,6 +25,8 @@ deps =
2525
2.0: Django>=2.0,<2.1
2626
2.1: Django>=2.1,<2.2
2727
2.2: Django>=2.2,<2.3
28+
3.0: Django>=3.0,<3.1
29+
3.1: Django>=3.1,<3.2
2830
commands =
2931
# Poetry install automatically install the specific versions from the `poetry.lock`
3032
# file regardless whether a different version is already present or not.

0 commit comments

Comments
 (0)