Skip to content

Commit

Permalink
Merge pull request #633 from umarmughal824/umar/django-32-support
Browse files Browse the repository at this point in the history
add django 3.2 support
  • Loading branch information
dekoza authored Jan 5, 2022
2 parents b648b07 + c9a2c53 commit 85f4b89
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 5 deletions.
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ Requirements
To be able to run **djoser** you have to meet following requirements:

- Python (3.6, 3.7, 3.8, 3.9)
- Django (2.2, 3.1)
- Django REST Framework 3.11.1
- Django (2.2, 3.1, 3.2)
- Django REST Framework (3.11.1, 3.12.1)

If you need to support other versions, please use djoser<2.

Expand Down
2 changes: 2 additions & 0 deletions docs/source/getting_started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,15 @@ Supported Django versions
* Django 1.11
* Django 2.2
* Django 3.1
* Django 3.2

Supported Django Rest Framework versions
----------------------------------------

* Django Rest Framework 3.9
* Django Rest Framework 3.10
* Django Rest Framework 3.11
* Django Rest Framework 3.12

Installation
------------
Expand Down
4 changes: 2 additions & 2 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ classifiers = [
"Framework :: Django",
"Framework :: Django :: 2.2",
"Framework :: Django :: 3.1",
"Framework :: Django :: 3.2",
"Intended Audience :: Developers",
"License :: OSI Approved :: MIT License",
"Operating System :: OS Independent",
Expand All @@ -35,7 +36,7 @@ python = "^3.6.1"
importlib-metadata = {version = "^1.0", python = "<3.8"}
djangorestframework-simplejwt = "^4.3.0"
django-templated-mail = "^1.1.1"
social-auth-app-django = "^4.0.0"
social-auth-app-django = "^5.0.0"
coreapi = "^2.3.3"
asgiref = "^3.2.10"
pytest = {version = "^6.0.2", optional=true}
Expand Down
2 changes: 2 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@ isolated_build = true
envlist =
py3{6,7,8}-django22-drf{311,312},
py3{8,9}-django31-drf{311,312}
py3{8,9}-django32-drf{311,312}

[testenv]
whitelist_externals = poetry
passenv = HOME CI TRAVIS TRAVIS_*
deps =
django22: django>=2.2,<2.3
django31: Django>=3.1,<3.2
django32: Django>=3.2,<3.3

drf311: djangorestframework>=3.11,<3.12
drf312: djangorestframework>=3.12,<3.13
Expand Down

0 comments on commit 85f4b89

Please sign in to comment.