Skip to content

Commit

Permalink
Merge pull request #85 from vintasoftware/drf-version
Browse files Browse the repository at this point in the history
Re-add support for `djangorestframework` 3.14
  • Loading branch information
fjsj authored Jun 3, 2024
2 parents f7800c4 + 700efd8 commit ff845ca
Show file tree
Hide file tree
Showing 6 changed files with 114 additions and 103 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ Change Log
Unreleased
~~~~~~~~~~

[1.3.0] - 2024-06-03
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Fixed
_____
* Re-add support for djangorestframework 3.14

[1.2.0] - 2024-05-27
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Fixed
Expand Down
2 changes: 1 addition & 1 deletion drf_rw_serializers/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

from __future__ import absolute_import, unicode_literals

__version__ = "1.2.0"
__version__ = "1.3.0"

# pylint: disable=invalid-name
default_app_config = "drf_rw_serializers.apps.DrfRwSerializersConfig"
Expand Down
194 changes: 97 additions & 97 deletions poetry.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "drf-rw-serializers"
version = "1.2.0"
version = "1.3.0"
description = "Generic views, viewsets and mixins that extend the Django REST Framework ones adding separated serializers for read and write operations"
authors = ["Vinta Software <[email protected]>"]
license = "MIT"
Expand All @@ -15,7 +15,7 @@ readme = "README.rst"

[tool.poetry.dependencies]
python = "^3.8"
djangorestframework = "^3.15.1"
djangorestframework = "^3.14.0"


[tool.poetry.group.dev.dependencies]
Expand Down
5 changes: 4 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,10 @@ def get_version(*file_paths):
"drf_rw_serializers",
],
include_package_data=True,
install_requires=["Django>=4.2,<6"],
install_requires=[
"Django>=4.2,<6",
"djangorestframework>=3.14,<4",
],
license="MIT",
zip_safe=False,
keywords="Django REST Framework, Serializers, REST, API, Django",
Expand Down
6 changes: 4 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
envlist =
# Django official Python support
# Source: https://docs.djangoproject.com/en/5.0/faq/install/#what-python-version-can-i-use-with-django
{py38,py39,py310,py311,py312}-django42
{py310,py311,py312}-django50
{py38,py39,py310,py311,py312}-{drf314,drf315}-django42
{py310,py311,py312}-drf315-django50

[gh-actions]
python =
Expand All @@ -25,6 +25,8 @@ deps =
poetry
django42: Django>=4.2,<5.0
django50: Django>=5.0,<5.1
drf314: djangorestframework>=3.14,<3.15
drf315: djangorestframework>=3.15,<3.16
commands_pre =
poetry install --with dev,test -v
commands =
Expand Down

0 comments on commit ff845ca

Please sign in to comment.