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

Jump to bottom

added testing for django5 #1634

Merged
merged 9 commits into from
Dec 7, 2023
Merged

added testing for django5 #1634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
485a877
added testing for django5
matthewhegarty Sep 19, 2023
7d457c0
removed reference to py12 - not officially supported by Django
matthewhegarty Nov 4, 2023
340f1d9
Merge branch 'main' into django-5
matthewhegarty Nov 4, 2023
ccdac0e
updated changelog
matthewhegarty Nov 4, 2023
d826299
updated tox versions
matthewhegarty Nov 4, 2023
a967911
Merge branch 'main' into django-5
matthewhegarty Dec 5, 2023
911757e
updated django5 version
matthewhegarty Dec 5, 2023
2e314b0
updated changelog
matthewhegarty Dec 6, 2023
6c4c0c1
Merge branch 'main' into django-5
matthewhegarty Dec 6, 2023
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
2 changes: 1 addition & 1 deletion docs/changelog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Changelog
3.3.4 (unreleased)
------------------

- Added support for django5 (#1634)
- Added `CONTRIBUTING.md`
- Show list of exported fields in Admin UI (#1685)

Expand All @@ -13,7 +14,6 @@ Changelog
- :meth:`~import_export.admin.ExportActionMixin.export_admin_action` can be overridden by subclassing it in the
``ModelAdmin`` (#1681)


3.3.2 (2023-11-09)
------------------

Expand Down
1 change: 1 addition & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"Framework :: Django :: 3.2",
"Framework :: Django :: 4.1",
"Framework :: Django :: 4.2",
"Framework :: Django :: 5.0",
"Intended Audience :: Developers",
"License :: OSI Approved :: BSD License",
"Operating System :: OS Independent",
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
min_version = 4.0
envlist =
{py38,py39,py310}-{django32}
{py310,py311}-{django41,django42,djangomain}
{py310,py311}-{django42,django50,djangomain}
# tablib dev temporarily removed - see issue #1602
# py311-djangomain-tablibdev

Expand All @@ -19,8 +19,8 @@ commands = python ./runtests.py
deps =
tablibdev: -egit+https://github.com/jazzband/tablib.git@master\#egg=tablib
django32: Django>=3.2,<4.0
django41: Django>=4.1,<4.2
django42: Django>=4.2,<4.3
django50: Django>=5.0,<6.0
djangomain: https://github.com/django/django/archive/main.tar.gz
-rrequirements/test.txt

Expand Down