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

Updated support Django versions #21

Merged
merged 3 commits into from
Oct 16, 2023
Merged

Updated support Django versions #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51f33c0
Speedup tox.
smithdc1 Oct 15, 2023
66d8c9b
Updated supported Django versions.
smithdc1 Oct 16, 2023
3feca62
Flake8 linting
smithdc1 Oct 16, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ jobs:
strategy:
matrix:
python-version:
- '3.7'
- '3.8'
- '3.9'
- '3.10'
- '3.11'
- '3.12'

steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ jobs:
strategy:
matrix:
python-version:
- '3.7'
- '3.8'
- '3.9'
- '3.10'
- '3.11'
- '3.12'

steps:
- uses: actions/checkout@v3
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# CHANGELOG FOR CRISPY-BOOTSTRAP4

## 2023.2

* Dropped support for Django 3.2, 4.0 and 4.1.
* Added support for Django 5.0.
* Added support for Python 3.12.
* Dropped support for django-crispy-forms 1.x.

## 2023.1

* Confirmed support for Django 4.2.
Expand Down
10 changes: 4 additions & 6 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,25 +30,23 @@ def get_long_description():
license="MIT",
version=VERSION,
packages=["crispy_bootstrap4"],
install_requires=["django-crispy-forms>=1.14.0", "django>=3.2"],
python_requires=">=3.7",
install_requires=["django-crispy-forms>=2.0", "django>=4.2"],
python_requires=">=3.8",
include_package_data=True,
classifiers=[
"Environment :: Web Environment",
"Development Status :: 5 - Production/Stable",
"Framework :: Django",
"Framework :: Django :: 3.2",
"Framework :: Django :: 4.0",
"Framework :: Django :: 4.1",
"Framework :: Django :: 4.2",
"Framework :: Django :: 5.0",
"License :: OSI Approved :: MIT License",
"Operating System :: OS Independent",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Topic :: Internet :: WWW/HTTP",
"Topic :: Internet :: WWW/HTTP :: Dynamic Content",
"Topic :: Software Development :: Libraries :: Python Modules",
Expand Down
7 changes: 5 additions & 2 deletions tests/results/bootstrap4/test_form_helper/bootstrap_form_show_errors_bs4_false.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
<label for="id_email" class=" requiredField"> email<span class="asteriskField">*</span> </label>
<div class="">
<div class="input-group">
<input type="text" name="email" value="invalidemail" maxlength="30" class="textinput textInput inputtext form-control is-invalid" required id="id_email" />
<input type="text" name="email" value="invalidemail" maxlength="30" aria-describedby="id_email_helptext" aria-invalid="true"
class="textinput textInput inputtext form-control is-invalid" required id="id_email" />
<div class="input-group-append"><span class="input-group-text">whatever</span></div>
</div>
<small id="hint_id_email" class="form-text text-muted">Insert your email</small>
Expand All @@ -22,6 +23,7 @@
class="textinput textInput inputtext form-control is-invalid"
required
id="id_first_name"
aria-invalid="true"
/>
</div>
</div>
Expand All @@ -31,7 +33,8 @@
<div class="">
<div class="input-group">
<div class="input-group-prepend"><span class="input-group-text">foo</span></div>
<input type="text" name="last_name" value="last_name_too_long" maxlength="5" class="textinput textInput inputtext form-control is-invalid" required id="id_last_name" />
<input type="text" name="last_name" value="last_name_too_long" maxlength="5" aria-invalid="true"
class="textinput textInput inputtext form-control is-invalid" required id="id_last_name" />
<div class="input-group-append"><span class="input-group-text">bar</span></div>
</div>
</div>
Expand Down
69 changes: 69 additions & 0 deletions tests/results/bootstrap4/test_form_helper/bootstrap_form_show_errors_bs4_false_lt50.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
<form method="post">
<div id="div_id_email" class="form-group">
<label for="id_email" class=" requiredField"> email<span class="asteriskField">*</span> </label>
<div class="">
<div class="input-group">
<input type="text" name="email" value="invalidemail" maxlength="30" class="textinput textInput inputtext form-control is-invalid" required id="id_email" />
<div class="input-group-append"><span class="input-group-text">whatever</span></div>
</div>
<small id="hint_id_email" class="form-text text-muted">Insert your email</small>
</div>
</div>
<div id="div_id_first_name" class="form-group">
<label for="id_first_name" class=" requiredField">first name<span class="asteriskField">*</span> </label>
<div class="">
<div class="input-group">
<div class="input-group-prepend"><span class="input-group-text">blabla</span></div>
<input
type="text"
name="first_name"
value="first_name_too_long"
maxlength="5"
class="textinput textInput inputtext form-control is-invalid"
required
id="id_first_name"
/>
</div>
</div>
</div>
<div id="div_id_last_name" class="form-group">
<label for="id_last_name" class=" requiredField">last name<span class="asteriskField">*</span> </label>
<div class="">
<div class="input-group">
<div class="input-group-prepend"><span class="input-group-text">foo</span></div>
<input type="text" name="last_name" value="last_name_too_long" maxlength="5" class="textinput textInput inputtext form-control is-invalid" required id="id_last_name" />
<div class="input-group-append"><span class="input-group-text">bar</span></div>
</div>
</div>
</div>
<div id="div_id_password1" class="form-group">
<label for="id_password1" class=" requiredField">password<span class="asteriskField">*</span> </label>
<div class="">
<div class="input-group">
<input type="password" name="password1" maxlength="30" class="textinput textInput form-control" required id="id_password1" />
<div class="input-group-append"><span class="input-group-text">whatever</span></div>
</div>
</div>
</div>
<div id="div_id_password2" class="form-group">
<label
for="id_password2"
class=" requiredField"
>
re-enter password<span class="asteriskField">*</span>
</label>
<div class="">
<div class="input-group">
<div class="input-group-prepend"><span class="input-group-text">blabla</span></div>
<input
type="password"
name="password2"
maxlength="30"
class="textinput textInput form-control"
required
id="id_password2"
/>
</div>
</div>
</div>
</form>
7 changes: 5 additions & 2 deletions tests/results/bootstrap4/test_form_helper/bootstrap_form_show_errors_bs4_true.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
<label for="id_email" class=" requiredField"> email<span class="asteriskField">*</span> </label>
<div class="">
<div class="input-group">
<input type="text" name="email" value="invalidemail" maxlength="30" class="textinput textInput inputtext form-control is-invalid" required id="id_email" />
<input type="text" name="email" value="invalidemail" maxlength="30" aria-invalid="true" aria-describedby="id_email_helptext"
class="textinput textInput inputtext form-control is-invalid" required id="id_email" />
<div class="input-group-append"><span class="input-group-text">whatever</span></div>
<span id="error_1_id_email" class="invalid-feedback"><strong>Enter a valid email address.</strong></span>
</div>
Expand All @@ -20,7 +21,8 @@
<div class="">
<div class="input-group">
<div class="input-group-prepend"><span class="input-group-text">blabla</span></div>
<input type="text" name="first_name" value="first_name_too_long" maxlength="5" class="textinput textInput inputtext form-control is-invalid" required id="id_first_name" />
<input type="text" name="first_name" value="first_name_too_long" maxlength="5" aria-invalid="true"
class="textinput textInput inputtext form-control is-invalid" required id="id_first_name" />
<span id="error_1_id_first_name" class="invalid-feedback"><strong>Ensure this value has at most 5 characters (it has 19).</strong></span>
</div>
</div>
Expand All @@ -38,6 +40,7 @@
class="textinput textInput inputtext form-control is-invalid"
required
id="id_last_name"
aria-invalid="true"
/>
<div class="input-group-append"><span class="input-group-text">bar</span></div>
<span id="error_1_id_last_name" class="invalid-feedback"><strong>Ensure this value has at most 5 characters (it has 18).</strong></span>
Expand Down
68 changes: 68 additions & 0 deletions tests/results/bootstrap4/test_form_helper/bootstrap_form_show_errors_bs4_true_lt50.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
<form method="post">
<div id="div_id_email" class="form-group">
<label for="id_email" class=" requiredField"> email<span class="asteriskField">*</span> </label>
<div class="">
<div class="input-group">
<input type="text" name="email" value="invalidemail" maxlength="30" class="textinput textInput inputtext form-control is-invalid" required id="id_email" />
<div class="input-group-append"><span class="input-group-text">whatever</span></div>
<span id="error_1_id_email" class="invalid-feedback"><strong>Enter a valid email address.</strong></span>
</div>
<small id="hint_id_email" class="form-text text-muted">Insert your email</small>
</div>
</div>
<div id="div_id_first_name" class="form-group">
<label
for="id_first_name"
class=" requiredField"
>
first name<span class="asteriskField">*</span>
</label>
<div class="">
<div class="input-group">
<div class="input-group-prepend"><span class="input-group-text">blabla</span></div>
<input type="text" name="first_name" value="first_name_too_long" maxlength="5" class="textinput textInput inputtext form-control is-invalid" required id="id_first_name" />
<span id="error_1_id_first_name" class="invalid-feedback"><strong>Ensure this value has at most 5 characters (it has 19).</strong></span>
</div>
</div>
</div>
<div id="div_id_last_name" class="form-group">
<label for="id_last_name" class=" requiredField"> last name<span class="asteriskField">*</span> </label>
<div class="">
<div class="input-group">
<div class="input-group-prepend"><span class="input-group-text">foo</span></div>
<input
type="text"
name="last_name"
value="last_name_too_long"
maxlength="5"
class="textinput textInput inputtext form-control is-invalid"
required
id="id_last_name"
/>
<div class="input-group-append"><span class="input-group-text">bar</span></div>
<span id="error_1_id_last_name" class="invalid-feedback"><strong>Ensure this value has at most 5 characters (it has 18).</strong></span>
</div>
</div>
</div>
<div
id="div_id_password1"
class="form-group"
>
<label for="id_password1" class=" requiredField"> password<span class="asteriskField">*</span> </label>
<div class="">
<div class="input-group">
<input type="password" name="password1" maxlength="30" class="textInput textinput form-control" required id="id_password1" />
<div class="input-group-append"><span class="input-group-text">whatever</span></div>
</div>
</div>
</div>
<div id="div_id_password2" class="form-group">
<label for="id_password2" class=" requiredField"> re-enter password<span class="asteriskField">*</span> </label>
<div class="">
<div class="input-group">
<div class="input-group-prepend"><span class="input-group-text">blabla</span></div>
<input type="password" name="password2" maxlength="30" class="textInput textinput form-control" required id="id_password2" />
</div>
</div>
</div>
</form>
11 changes: 6 additions & 5 deletions tests/results/bootstrap4/test_form_helper/test_form_show_errors_non_field_errors_false.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</div>
<div id="div_id_email" class="form-group"> <label for="id_email" class=" requiredField"> email<span
class="asteriskField">*</span> </label>
<div> <input type="text" name="email" maxlength="30"
<div> <input type="text" name="email" maxlength="30" aria-describedby="id_email_helptext" aria-invalid="true"
class="textinput textInput inputtext form-control is-invalid" required id="id_email"> <small
id="hint_id_email" class="form-text text-muted">Insert your email</small> </div>
</div>
Expand All @@ -22,18 +22,19 @@
</div>
<div id="div_id_first_name" class="form-group"> <label for="id_first_name" class=" requiredField"> first name<span
class="asteriskField">*</span> </label>
<div> <input type="text" name="first_name" maxlength="5"
<div> <input type="text" name="first_name" maxlength="5" aria-invalid="true"
class="textinput textInput inputtext form-control is-invalid" required id="id_first_name"> </div>
</div>
<div id="div_id_last_name" class="form-group"> <label for="id_last_name" class=" requiredField"> last name<span
class="asteriskField">*</span> </label>
<div> <input type="text" name="last_name" maxlength="5"
<div> <input type="text" name="last_name" maxlength="5" aria-invalid="true"
class="textinput textInput inputtext form-control is-invalid" required id="id_last_name"> </div>
</div>
<div id="div_id_datetime_field" class="form-group">
<label class=" requiredField">date time<span class="asteriskField">*</span> </label>
<div> <input type="text" name="datetime_field_0" class="dateinput form-control is-invalid" required
id="id_datetime_field_0"><input type="text" name="datetime_field_1"
class="timeinput form-control is-invalid" required id="id_datetime_field_1"> </div>
id="id_datetime_field_0" aria-invalid="true"><input type="text" name="datetime_field_1"
aria-invalid="true" class="timeinput form-control is-invalid" required id="id_datetime_field_1">
</div>
</div>
</form>
2 changes: 1 addition & 1 deletion ..._errors_non_field_errors_false_lte40.html → ...w_errors_non_field_errors_false_lt50.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
class="textinput textInput inputtext form-control is-invalid" required id="id_last_name"> </div>
</div>
<div id="div_id_datetime_field" class="form-group">
<label class=" requiredField" for="id_datetime_field_0">date time<span class="asteriskField">*</span> </label>
<label class=" requiredField">date time<span class="asteriskField">*</span> </label>
<div> <input type="text" name="datetime_field_0" class="dateinput form-control is-invalid" required
id="id_datetime_field_0"><input type="text" name="datetime_field_1"
class="timeinput form-control is-invalid" required id="id_datetime_field_1"> </div>
Expand Down
8 changes: 4 additions & 4 deletions tests/results/bootstrap4/test_form_helper/test_form_show_errors_non_field_errors_true.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</div>
<div id="div_id_email" class="form-group"> <label for="id_email" class=" requiredField"> email<span
class="asteriskField">*</span> </label>
<div> <input type="text" name="email" maxlength="30"
<div> <input type="text" name="email" maxlength="30" aria-describedby="id_email_helptext" aria-invalid="true"
class="textinput textInput inputtext form-control is-invalid" required id="id_email"> <span
id="error_1_id_email" class="invalid-feedback"><strong>This field is required.</strong></span> <small
id="hint_id_email" class="form-text text-muted">Insert your email</small> </div>
Expand All @@ -28,22 +28,22 @@
</div>
<div id="div_id_first_name" class="form-group"> <label for="id_first_name" class=" requiredField"> first name<span
class="asteriskField">*</span> </label>
<div> <input type="text" name="first_name" maxlength="5"
<div> <input type="text" name="first_name" maxlength="5" aria-invalid="true"
class="textinput textInput inputtext form-control is-invalid" required id="id_first_name"> <span
id="error_1_id_first_name" class="invalid-feedback"><strong>This field is required.</strong></span>
</div>
</div>
<div id="div_id_last_name" class="form-group"> <label for="id_last_name" class=" requiredField"> last name<span
class="asteriskField">*</span> </label>
<div> <input type="text" name="last_name" maxlength="5"
<div> <input type="text" name="last_name" maxlength="5" aria-invalid="true"
class="textinput textInput inputtext form-control is-invalid" required id="id_last_name"> <span
id="error_1_id_last_name" class="invalid-feedback"><strong>This field is required.</strong></span>
</div>
</div>
<div id="div_id_datetime_field" class="form-group">
<label class=" requiredField">date time<span class="asteriskField">*</span> </label>
<div> <input type="text" name="datetime_field_0" class="dateinput form-control is-invalid" required
id="id_datetime_field_0"><input type="text" name="datetime_field_1"
id="id_datetime_field_0" aria-invalid="true"><input type="text" name="datetime_field_1" aria-invalid="true"
class="timeinput form-control is-invalid" required id="id_datetime_field_1"> <span
id="error_1_id_datetime_field" class="invalid-feedback"><strong>This field is required.</strong></span>
</div>
Expand Down
2 changes: 1 addition & 1 deletion ...w_errors_non_field_errors_true_lte40.html → ...ow_errors_non_field_errors_true_lt50.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
</div>
</div>
<div id="div_id_datetime_field" class="form-group">
<label class=" requiredField" for="id_datetime_field_0">date time<span class="asteriskField">*</span> </label>
<label class=" requiredField">date time<span class="asteriskField">*</span> </label>
<div> <input type="text" name="datetime_field_0" class="dateinput form-control is-invalid" required
id="id_datetime_field_0"><input type="text" name="datetime_field_1"
class="timeinput form-control is-invalid" required id="id_datetime_field_1"> <span
Expand Down
Loading