diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3067f6a..fd0e7f6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,72 +8,51 @@ jobs: fail-fast: false matrix: include: - # Django 1.11 - - django-version: "1.11.0" - python-version: "3.5" - - django-version: "1.11.0" - python-version: "3.6" - - django-version: "1.11.0" - python-version: "3.7" - # Django 2.0 - - django-version: "2.0.0" - python-version: "3.5" - - django-version: "2.0.0" - python-version: "3.6" - - django-version: "2.0.0" - python-version: "3.7" - # Django 2.1 - - django-version: "2.1.0" - python-version: "3.5" - - django-version: "2.1.0" - python-version: "3.6" - - django-version: "2.1.0" - python-version: "3.7" - # Django 2.2 - - django-version: "2.2.0" - python-version: "3.5" - - django-version: "2.2.0" - python-version: "3.6" - - django-version: "2.2.0" - python-version: "3.7" - - django-version: "2.2.0" + # Django 4.2 + - django-version: "4.2" python-version: "3.8" - - django-version: "2.2.0" + - django-version: "4.2" python-version: "3.9" - # Django 3.0 - - django-version: "3.0.0" - python-version: "3.6" - - django-version: "3.0.0" - python-version: "3.7" - - django-version: "3.0.0" - python-version: "3.8" - - django-version: "3.0.0" - python-version: "3.9" - # Django 3.1 - - django-version: "3.1.0" - python-version: "3.6" - - django-version: "3.1.0" - python-version: "3.7" - - django-version: "3.1.0" - python-version: "3.8" - - django-version: "3.1.0" - python-version: "3.9" - # Django 3.2 - - django-version: "3.2.0" - python-version: "3.6" - - django-version: "3.2.0" - python-version: "3.7" - - django-version: "3.2.0" - python-version: "3.8" - - django-version: "3.2.0" - python-version: "3.9" - # Django 4.0 - - django-version: "4.0.0" - python-version: "3.8" - - django-version: "4.0.0" - python-version: "3.9" - - django-version: "4.0.0" + - django-version: "4.2" + python-version: "3.10" + - django-version: "4.2" + python-version: "3.11" + - django-version: "4.2" + python-version: "3.12" + # Django 5.0 + - django-version: "5.0" + python-version: "3.10" + - django-version: "5.0" + python-version: "3.11" + - django-version: "5.0" + python-version: "3.12" + # Django 5.1 + - django-version: "5.1" + python-version: "3.10" + - django-version: "5.1" + python-version: "3.11" + - django-version: "5.1" + python-version: "3.12" + - django-version: "5.1" + python-version: "3.13" + # Django 5.2 + - django-version: "5.2" python-version: "3.10" + - django-version: "5.2" + python-version: "3.11" + - django-version: "5.2" + python-version: "3.12" + - django-version: "5.2" + python-version: "3.13" + - django-version: "5.2" + python-version: "3.14" + # Django 6.0 + - django-version: "6.0" + python-version: "3.12" + - django-version: "6.0" + python-version: "3.13" + - django-version: "6.0" + python-version: "3.14" steps: - uses: actions/checkout@v3 diff --git a/CHANGES.rst b/CHANGES.rst index 0713556..b2f489e 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,7 +1,10 @@ -2.0.1 (unreleased) +3.0.0 (unreleased) ------------------ -- Nothing changed yet. +- Dropped support for Python 3.5, 3.6, and 3.7. +- Dropped support for Django 1.11, 2.0, 2.1, 2.2, 3.0, 3.1, 3.2, and 4.0. +- Added support for Django 4.2, 5.0, 5.1, 5.2, and 6.0. +- Added support for Python 3.11, 3.12, 3.13, and 3.14. 2.0.0 (2022-08-11) diff --git a/betterforms/__init__.py b/betterforms/__init__.py index 107b59f..1069a0a 100644 --- a/betterforms/__init__.py +++ b/betterforms/__init__.py @@ -1 +1,3 @@ -__version__ = __import__('pkg_resources').get_distribution('django-betterforms').version +from importlib.metadata import version + +__version__ = version('django-betterforms') diff --git a/betterforms/tests.py b/betterforms/tests.py index 70c417f..0eb44b3 100644 --- a/betterforms/tests.py +++ b/betterforms/tests.py @@ -367,8 +367,8 @@ class TestForm(BetterForm): test = """