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.

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

Remove support for django 3.2 #1790

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/pre-commit.yml
Expand Up @@ -8,8 +8,8 @@ jobs:
main:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: 3.x
- uses: pre-commit/action@v3.0.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Expand Up @@ -15,7 +15,7 @@ jobs:
with:
fetch-depth: 0
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.x"
- name: Install pypa/build
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Expand Up @@ -52,9 +52,9 @@ jobs:
-u${{ env.IMPORT_EXPORT_MYSQL_USER }}
-p${{ env.IMPORT_EXPORT_MYSQL_PASSWORD }}
- name: Check out repository code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install Dependencies
Expand Down
5 changes: 5 additions & 0 deletions docs/changelog.rst
Expand Up @@ -5,6 +5,11 @@ Changelog

Version 4 introduces breaking changes. Please refer to :doc:`release notes<release_notes>`.

4.0.0-rc.4 (unreleased)
-----------------------

- Removed support for django 3.2 (#1790)

4.0.0-rc.3 (2024-04-13)
-----------------------

Expand Down
3 changes: 1 addition & 2 deletions import_export/admin.py
Expand Up @@ -667,8 +667,7 @@ def get_export_queryset(self, request):
"model_admin": self,
"sortable_by": self.sortable_by,
}
if django.VERSION >= (4, 0):
changelist_kwargs["search_help_text"] = self.search_help_text
changelist_kwargs["search_help_text"] = self.search_help_text

class ExportChangeList(ChangeList):
def get_results(self, request):
Expand Down
1 change: 0 additions & 1 deletion pyproject.toml
Expand Up @@ -17,7 +17,6 @@ requires-python = ">=3.8"
dynamic = ["version", "readme"]
classifiers = [
"Framework :: Django",
"Framework :: Django :: 3.2",
"Framework :: Django :: 4.2",
"Framework :: Django :: 5.0",
"Intended Audience :: Developers",
Expand Down
85 changes: 32 additions & 53 deletions tests/core/tests/admin_integration/test_import.py
Expand Up @@ -4,7 +4,6 @@
from unittest import mock
from unittest.mock import patch

import django
from core.admin import AuthorAdmin, BookAdmin, CustomBookAdmin, ImportMixin
from core.models import Author, Book, EBook, Parent
from core.tests.admin_integration.mixins import AdminTestMixin
Expand Down Expand Up @@ -162,19 +161,14 @@ def test_import_action_handles_UnicodeDecodeError_as_form_error(self):
"'UnicodeDecodeError' encountered while trying to read file. "
"Ensure you have chosen the correct format for the file."
)
# required for testing via tox
# remove after django 5.0 released
if django.VERSION >= (4, 0):
with warnings.catch_warnings():
warnings.filterwarnings("ignore", category=DeprecationWarning)
try:
self.assertFormError(
response.context["form"], "import_file", target_msg
)
except TypeError:
self.assertFormError(response, "form", "import_file", target_msg)
else:
self.assertFormError(response, "form", "import_file", target_msg)
with warnings.catch_warnings():
warnings.filterwarnings("ignore", category=DeprecationWarning)
try:
self.assertFormError(
response.context["form"], "import_file", target_msg
)
except TypeError:
self.assertFormError(response, "form", "import_file", target_msg)

def test_import_action_handles_ValueError_as_form_error(self):
with mock.patch(
Expand All @@ -188,19 +182,14 @@ def test_import_action_handles_ValueError_as_form_error(self):
"Ensure you have chosen the correct format for the file."
)

# required for testing via tox
# remove after django 5.0 released
if django.VERSION >= (4, 0):
with warnings.catch_warnings():
warnings.filterwarnings("ignore", category=DeprecationWarning)
try:
self.assertFormError(
response.context["form"], "import_file", target_msg
)
except TypeError:
self.assertFormError(response, "form", "import_file", target_msg)
else:
self.assertFormError(response, "form", "import_file", target_msg)
with warnings.catch_warnings():
warnings.filterwarnings("ignore", category=DeprecationWarning)
try:
self.assertFormError(
response.context["form"], "import_file", target_msg
)
except TypeError:
self.assertFormError(response, "form", "import_file", target_msg)

def test_import_action_handles_FieldError(self):
# issue 1722
Expand All @@ -226,19 +215,14 @@ def test_import_action_handles_ValueError_as_form_error_with_translation(self):
"Asegúrese que seleccionó el formato correcto para el archivo."
)

# required for testing via tox
# remove after django 5.0 released
if django.VERSION >= (4, 0):
with warnings.catch_warnings():
warnings.filterwarnings("ignore", category=DeprecationWarning)
try:
self.assertFormError(
response.context["form"], "import_file", target_msg
)
except TypeError:
self.assertFormError(response, "form", "import_file", target_msg)
else:
self.assertFormError(response, "form", "import_file", target_msg)
with warnings.catch_warnings():
warnings.filterwarnings("ignore", category=DeprecationWarning)
try:
self.assertFormError(
response.context["form"], "import_file", target_msg
)
except TypeError:
self.assertFormError(response, "form", "import_file", target_msg)

def test_import_action_invalidates_data_sheet_with_no_headers_or_data(self):
# GET the import form
Expand All @@ -256,19 +240,14 @@ def test_import_action_invalidates_data_sheet_with_no_headers_or_data(self):
"has the correct headers or data for import."
)

# required for testing via tox
# remove after django 5.0 released
if django.VERSION >= (4, 0):
with warnings.catch_warnings():
warnings.filterwarnings("ignore", category=DeprecationWarning)
try:
self.assertFormError(
response.context["form"], "import_file", target_msg
)
except TypeError:
self.assertFormError(response, "form", "import_file", target_msg)
else:
self.assertFormError(response, "form", "import_file", target_msg)
with warnings.catch_warnings():
warnings.filterwarnings("ignore", category=DeprecationWarning)
try:
self.assertFormError(
response.context["form"], "import_file", target_msg
)
except TypeError:
self.assertFormError(response, "form", "import_file", target_msg)

@ignore_widget_deprecation_warning
def test_delete_from_admin(self):
Expand Down
57 changes: 1 addition & 56 deletions tests/core/tests/test_widgets.py
@@ -1,7 +1,7 @@
import json
from datetime import date, datetime, time, timedelta
from decimal import Decimal
from unittest import mock, skipUnless
from unittest import mock
from unittest.mock import patch

import django
Expand Down Expand Up @@ -102,17 +102,6 @@ class FormatDatetimeTest(TestCase):
target_dt = "02.08.0010"
format = "%d.%m.%Y"

@skipUnless(
django.VERSION[0] < 4, f"skipping django {django.VERSION} version specific test"
)
def test_format_datetime_lt_django4(self):
self.assertEqual(
self.target_dt, widgets.format_datetime(self.date, self.format)
)

@skipUnless(
django.VERSION[0] >= 4, f"running django {django.VERSION} version specific test"
)
def test_format_datetime_gte_django4(self):
self.assertEqual(
self.target_dt, widgets.format_datetime(self.date, self.format)
Expand Down Expand Up @@ -383,17 +372,6 @@ def test_render_None_coerce_to_string_False(self):
def test_render_invalid_type(self):
self.assertEqual(self.widget.render("a"), "")

@skipUnless(
django.VERSION[0] < 4, f"skipping django {django.VERSION} version specific test"
)
@override_settings(LANGUAGE_CODE="fr-fr", USE_L10N=True)
def test_locale_render_coerce_to_string_lt4(self):
self.assertEqual("11,111", self.widget_coerce_to_string.render(self.value))

@skipUnless(
django.VERSION[0] >= 4,
f"skipping django {django.VERSION} version specific test",
)
@override_settings(LANGUAGE_CODE="fr-fr")
def test_locale_render_coerce_to_string_gte4(self):
self.assertEqual("11,111", self.widget_coerce_to_string.render(self.value))
Expand Down Expand Up @@ -426,17 +404,6 @@ def test_clean_empty_string(self):
self.assertEqual(self.widget.clean(" "), None)
self.assertEqual(self.widget.clean("\r\n\t"), None)

@skipUnless(
django.VERSION[0] < 4, f"skipping django {django.VERSION} version specific test"
)
@override_settings(LANGUAGE_CODE="fr-fr", USE_L10N=True)
def test_locale_render_coerce_to_string_lt4(self):
self.assertEqual(self.widget_coerce_to_string.render(self.value), "11,111")

@skipUnless(
django.VERSION[0] >= 4,
f"skipping django {django.VERSION} version specific test",
)
@override_settings(LANGUAGE_CODE="fr-fr")
def test_locale_render_coerce_to_string_gte4(self):
self.assertEqual(self.widget_coerce_to_string.render(self.value), "11,111")
Expand Down Expand Up @@ -470,17 +437,6 @@ def test_clean_empty_string(self):
self.assertEqual(self.widget.clean(" "), None)
self.assertEqual(self.widget.clean("\r\n\t"), None)

@skipUnless(
django.VERSION[0] < 4, f"skipping django {django.VERSION} version specific test"
)
@override_settings(LANGUAGE_CODE="fr-fr", USE_L10N=True)
def test_locale_render_coerce_to_string_lt4(self):
self.assertEqual(self.widget.render(self.value), "11,111")

@skipUnless(
django.VERSION[0] >= 4,
f"skipping django {django.VERSION} version specific test",
)
@override_settings(LANGUAGE_CODE="fr-fr")
def test_locale_render_coerce_to_string_gte4(self):
self.assertEqual(self.widget.render(self.value), "11,111")
Expand Down Expand Up @@ -511,17 +467,6 @@ def test_clean_empty_string(self):
def test_render_invalid_type(self):
self.assertEqual(self.widget.render("a"), "")

@skipUnless(
django.VERSION[0] < 4, f"skipping django {django.VERSION} version specific test"
)
@override_settings(LANGUAGE_CODE="fr-fr", USE_L10N=True)
def test_locale_render_lt_django4(self):
self.assertEqual(self.widget_coerce_to_string.render(self.value), "0")

@skipUnless(
django.VERSION[0] >= 4,
f"skipping django {django.VERSION} version specific test",
)
@override_settings(LANGUAGE_CODE="fr-fr")
def test_locale_render_gte_django4(self):
self.assertEqual(self.widget_coerce_to_string.render(self.value), "0")
Expand Down
5 changes: 2 additions & 3 deletions tox.ini
@@ -1,7 +1,7 @@
[tox]
min_version = 4.0
envlist =
{py38,py39,py310}-{django32}
{py38,py39}-{django42}
{py310,py311,py312}-{django42,django50,djangomain}
# tablib dev temporarily removed - see issue #1602
# py311-djangomain-tablibdev
Expand All @@ -19,8 +19,7 @@ setenv = PYTHONPATH = {toxinidir}/tests
commands = python ./runtests.py
deps =
tablibdev: -egit+https://github.com/jazzband/tablib.git@master\#egg=tablib
django32: Django>=3.2,<4.0
django42: Django>=4.2,<4.3
django42: Django>=4.2,<5.0
django50: Django>=5.0,<6.0
djangomain: https://github.com/django/django/archive/main.tar.gz
-rrequirements/test.txt
Expand Down