Merge branch 'main' into patch-1

Author: dyve

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
 

.github/workflows/dependabot-auto-approve-and-merge.yml

@@ -17,7 +17,7 @@ jobs:
       # This step will fail (without approval) if there's no metadata.
       - name: Dependabot metadata
         id: dependabot-metadata
-        uses: dependabot/fetch-metadata@v1.3.1
+        uses: dependabot/fetch-metadata@v1.3.3
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       # Approve the PR.

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 22.1 (in development)
+
+- Add support for Django 4.1.
+- Drop support for Django 2.2 (EOL).
+
 ## 21.3 (2021-12-27)
 
 - Drop support for Python 3.6 (EOL, #247, #248).
@@ -39,7 +44,7 @@
 - Document known issue with `RadioSelectButtonGroup` (#114).
 - Bump Bootstrap from 5.0.0 to 5.0.1 (#110).
 - Fix validation HTML for checkbox and radio select (#92).
-- Ignore placeholders in attributes in render_tag (#103). 
+- Ignore placeholders in attributes in render_tag (#103).
 - Update default Bootstrap to 5.0.0 (#97).
 - Fix issue where error messages were not displayed for input groups.
 - Introduce `server_side_validation` setting for controlling Bootstrap 5 server-side validation classes (#90).
@@ -85,7 +90,7 @@
 
 ## 0.2.0 (2021-03-22)
 
-- Add floating labels for supported widgets. 
+- Add floating labels for supported widgets.
 - Do not abuse title element for help text.
 - Remove `InlineFieldRenderer`.
 - Simplify size parameters, only accept "sm", "md", "lg".
@@ -98,6 +103,6 @@
 - Started `django-bootstrap5` based on `django-bootstrap4`.
 - Thanks everybody that contributed to `django-bootstrap4` and earlier versions!
 
-## 0.1.0 (2013-08-13) 
+## 0.1.0 (2013-08-13)
 
-- Reserving the name "django-bootstrap5" at PyPI (released as 0.1). 
+- Reserving the name "django-bootstrap5" at PyPI (released as 0.1).

README.md

@@ -17,7 +17,7 @@ Ready for production. Issues and pull requests welcome, see [CONTRIBUTING.md](CO
 
 ## Requirements
 
-Python 3.7 or newer with Django >= 2.2 or newer.
+Python 3.7 or newer with Django 3.2 or newer.
 
 ## Documentation
 
@@ -30,7 +30,7 @@ The full documentation is at https://django-bootstrap5.readthedocs.io/
     ```bash
     pip install django-bootstrap5
     ```
-    
+
 2. Add to `INSTALLED_APPS` in your `settings.py`:
 
    ```python

docs/requirements.txt

@@ -1,3 +1,3 @@
-sphinx==4.4.0
+sphinx==5.1.1
 sphinx_rtd_theme==1.0.0
 m2r2==0.3.2

example/requirements.txt

@@ -1,2 +1,2 @@
 ..
-django>=2.2
+django>=3.2

requirements-dev.txt

@@ -1,15 +1,15 @@
 -r docs/requirements.txt
-django==4.0.3
-black==22.1.0
+django==4.1
+black==22.6.0
 isort==5.10.1
-flake8==4.0.1
+flake8==5.0.4
 pydocstyle==6.1.1
 docformatter==1.4
 autoflake==1.4
-tox==3.24.5
+tox==3.25.1
 wheel==0.37.1
-setuptools==60.9.3
-twine==3.8.0
-pillow==9.0.1
-coverage[toml]==6.3.2
-beautifulsoup4==4.10.0
+setuptools==63.4.1
+twine==4.0.1
+pillow==9.2.0
+coverage[toml]==6.4.2
+beautifulsoup4==4.11.1

setup.cfg

@@ -12,9 +12,9 @@ classifiers =
     Development Status :: 5 - Production/Stable
     Environment :: Web Environment
     Framework :: Django
-    Framework :: Django :: 2.2
     Framework :: Django :: 3.2
     Framework :: Django :: 4.0
+    Framework :: Django :: 4.1
     Intended Audience :: Developers
     License :: OSI Approved :: BSD License
     Operating System :: OS Independent
@@ -34,7 +34,7 @@ zip_safe = False
 include_package_data = True
 python_requires = >=3.7
 install_requires =
-    Django>=2.2
+    Django>=3.2
 
 [options.packages.find]
 where = src

tox.ini

@@ -3,10 +3,10 @@ isolated_build = True
 envlist =
     lint
     docs
-    py37-django{22,32}
-    py38-django{32,40,main}
-    py39-django{32,40,main}
-    py310-django{32,40,main}
+    py37-django{32}
+    py38-django{32,40,41,main}
+    py39-django{32,40,41,main}
+    py310-django{32,40,41,main}
     check-description
     check-manifest
     coverage
@@ -26,9 +26,9 @@ setenv =
 commands =
     coverage run --parallel-mode manage.py test -v1 --noinput
 deps =
-    django22: Django==2.2.*
     django32: Django==3.2.*
     django40: Django==4.0.*
+    django41: Django==4.1.*
     djangomain: https://github.com/django/django/archive/main.tar.gz
     beautifulsoup4>=4.8.0
     pillow