Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ on:
push:
tags-ignore:
- '*'
branches:
- '*'
branches: ['main']
pull_request:
branches: ['main']
workflow_call:
workflow_dispatch:
inputs:
Expand Down
28 changes: 25 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ on:
push:
tags-ignore:
- '*'
branches:
- '*'
branches: ['main']
pull_request:
branches: ['main']
workflow_call:
workflow_dispatch:
inputs:
Expand Down Expand Up @@ -41,6 +41,7 @@ jobs:
- '4.2' # LTS April 2026
- '5.1' # December 2025
- '5.2' # LTS April 2028
- '6.0a1' # alpha prerelease
exclude:
- django-version: '4.2'
postgres-version: '9.6'
Expand Down Expand Up @@ -91,6 +92,21 @@ jobs:
# https://github.com/psycopg/psycopg2/pull/1695
- python-version: '3.14'
psycopg-version: 'psycopg2'

- postgres-version: '9.6'
django-version: '6.0a1'
- postgres-version: '12'
django-version: '6.0a1'
- python-version: '3.9'
django-version: '6.0a1'
- python-version: '3.10'
django-version: '6.0a1'
- python-version: '3.11'
django-version: '6.0a1'
- python-version: '3.12'
django-version: '6.0a1'
- python-version: '3.13'
django-version: '6.0a1'

env:
RDBMS: postgres
Expand Down Expand Up @@ -138,9 +154,14 @@ jobs:
- name: Setup Just
uses: extractions/setup-just@v3
- name: Install Release Dependencies
shell: bash
run: |
just setup ${{ steps.sp.outputs.python-path }}
just test-lock "Django~=${{ matrix.django-version }}.0"
if [[ "${{ matrix.django-version }}" =~ (a|b|rc) ]]; then
just test-lock Django==${{ matrix.django-version }}
else
just test-lock Django~=${{ matrix.django-version }}.0
fi
- name: Install Emacs
if: ${{ github.event.inputs.debug == 'true' }}
run: |
Expand Down Expand Up @@ -315,6 +336,7 @@ jobs:
- name: Setup Just
uses: extractions/setup-just@v3
- name: Install Release Dependencies
shell: bash
run: |
just setup ${{ steps.sp.outputs.python-path }}
just test-lock Django~=${{ matrix.django-version }}.0
Expand Down
5 changes: 5 additions & 0 deletions doc/source/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
Change Log
==========

v2.2.5 (2025-09-27)
===================

* Support Django 6.0

v2.2.4 (2025-09-21)
===================

Expand Down
5 changes: 3 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "django-enum"
version = "2.2.4"
version = "2.2.5"
description = "Full and natural support for enumerations as Django model fields."
requires-python = ">=3.9,<4.0"
authors = [
Expand All @@ -15,7 +15,7 @@ keywords = [
"enum", "properties", "defines", "field", "django", "database",
"bitmask", "mask", "bitfield", "flags"
]
dependencies = ["django (>=3.2,<6.0)"]
dependencies = ["django (>=3.2,<6.1)"]
classifiers = [
"Environment :: Console",
"Framework :: Django",
Expand All @@ -29,6 +29,7 @@ classifiers = [
"Framework :: Django :: 5.0",
"Framework :: Django :: 5.1",
"Framework :: Django :: 5.2",
"Framework :: Django :: 6.0",
"Intended Audience :: Developers",
"License :: OSI Approved :: MIT License",
"Natural Language :: English",
Expand Down
2 changes: 1 addition & 1 deletion src/django_enum/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

__all__ = ["EnumField"]

VERSION = (2, 2, 4)
VERSION = (2, 2, 5)

__title__ = "Django Enum"
__version__ = ".".join(str(i) for i in VERSION)
Expand Down
Loading