Skip to content

Commit c3cfcb0

Browse files
tomhamiltonstubbertomhamiltonstubber
authored
Merge pull request #9 from palfrey/test-3.5
2 parents 6d77109 + 0e3edcc commit c3cfcb0

File tree

11 files changed

+267
-14
lines changed

11 files changed

+267
-14
lines changed

‎.github/workflows/tests.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,22 @@ on:
66
jobs:
77
test:
88
runs-on: ubuntu-latest
9+
strategy:
10+
matrix:
11+
python-version: [ '3.6', '3.7', '3.8', '3.9' ]
912
steps:
1013
- uses: actions/checkout@v2
1114

12-
- name: Set up Python
15+
- name: Set up Python ${{ matrix.python-version }}
1316
uses: actions/setup-python@v2
1417
with:
15-
python-version: 3.8
18+
python-version: ${{ matrix.python-version }}
1619

1720
- name: Install Dependencies
1821
run: make install
1922

2023
- name: Lint
24+
if: matrix.python-version == '3.9'
2125
run: make lint
2226

2327
- name: Tests

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
black = black -S -l 120 --target-version py38
1+
black = black -S -l 120
22

33
.PHONY: install
44
install:

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Twitter Bootstrap for Django Forms.
1212

1313
**django-jinja-bootstrap-form** has been used in production for 6 months and is stable.
1414

15-
Supports Django >=3.2. Python >=3.5.
15+
Supports Django >=3.2. Python >=3.6.
1616

1717
See [django-bootstrap-form](https://github.com/tzangms/django-bootstrap-form) for documentation. Usage should
1818
be the same except:

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@
4949
],
5050
packages=find_packages(),
5151
package_data={'bootstrapform_jinja': template_files},
52-
python_requires='>=3.8',
52+
python_requires='>=3.6',
5353
zip_safe=True,
5454
)

‎testing/fixtures_30/basic.html‎

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
<div class="form-group">
2+
<label class="control-label required" for="id_char_field">Char field</label>
3+
4+
<div class="">
5+
<input type="text" name="char_field" class=" form-control" required id="id_char_field">
6+
</div>
7+
</div>
8+
<div class="form-group">
9+
<label class="control-label required" for="id_choice_field">Choice field</label>
10+
11+
<div class="">
12+
<select name="choice_field" class=" form-control" id="id_choice_field">
13+
<option value="0">Zero</option>
14+
15+
<option value="1">One</option>
16+
17+
<option value="2">Two</option>
18+
19+
</select>
20+
</div>
21+
</div>
22+
<div class="form-group">
23+
<label class="control-label required">Radio choice</label>
24+
<div class="">
25+
<div class="radio">
26+
<label>
27+
<input type="radio" name="radio_choice" value="0" id="id_radio_choice_0" required>
28+
Zero
29+
</label>
30+
</div>
31+
<div class="radio">
32+
<label>
33+
<input type="radio" name="radio_choice" value="1" id="id_radio_choice_1" required>
34+
One
35+
</label>
36+
</div>
37+
<div class="radio">
38+
<label>
39+
<input type="radio" name="radio_choice" value="2" id="id_radio_choice_2" required>
40+
Two
41+
</label>
42+
</div>
43+
44+
</div>
45+
</div>
46+
<div class="form-group">
47+
<label class="control-label required" for="id_multiple_choice">Multiple choice</label>
48+
49+
<div class="">
50+
<select name="multiple_choice" class=" form-control" required id="id_multiple_choice" multiple>
51+
<option value="0">Zero</option>
52+
53+
<option value="1">One</option>
54+
55+
<option value="2">Two</option>
56+
57+
</select>
58+
</div>
59+
</div>
60+
<div class="form-group">
61+
<label class="control-label required" for="id_multiple_checkbox">Multiple checkbox</label>
62+
63+
<div class=" multiple-checkbox">
64+
<ul id="id_multiple_checkbox">
65+
<li><label for="id_multiple_checkbox_0"><input type="checkbox" name="multiple_checkbox" value="0" id="id_multiple_checkbox_0">
66+
Zero</label>
67+
68+
</li>
69+
<li><label for="id_multiple_checkbox_1"><input type="checkbox" name="multiple_checkbox" value="1" id="id_multiple_checkbox_1">
70+
One</label>
71+
72+
</li>
73+
<li><label for="id_multiple_checkbox_2"><input type="checkbox" name="multiple_checkbox" value="2" id="id_multiple_checkbox_2">
74+
Two</label>
75+
76+
</li>
77+
</ul>
78+
</div>
79+
</div>
80+
<div class="form-group">
81+
<label class="control-label required" for="id_file_fied">File fied</label>
82+
83+
<div class="">
84+
<input type="file" name="file_fied" required id="id_file_fied">
85+
</div>
86+
</div>
87+
<div class="form-group">
88+
<label class="control-label required" for="id_password_field">Password field</label>
89+
90+
<div class="">
91+
<input type="password" name="password_field" class=" form-control" required id="id_password_field">
92+
</div>
93+
</div>
94+
<div class="form-group">
95+
<label class="control-label required" for="id_textarea">Textarea</label>
96+
97+
<div class="">
98+
<textarea name="textarea" cols="40" rows="10" class=" form-control" required id="id_textarea">
99+
</textarea>
100+
</div>
101+
</div>
102+
<div class="form-group">
103+
<div class="">
104+
<div class="checkbox">
105+
<label class="required">
106+
<input type="checkbox" name="boolean_field" required id="id_boolean_field"> <span>Boolean field</span>
107+
</label>
108+
</div>
109+
</div>
110+
</div>

‎testing/fixtures_30/horizontal.html‎

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
<div class="form-group">
2+
<label class="control-label col-sm-2 col-lg-2 required" for="id_char_field">Char field</label>
3+
4+
<div class="col-sm-10 col-lg-10">
5+
<input type="text" name="char_field" class=" form-control" required id="id_char_field">
6+
</div>
7+
</div>
8+
<div class="form-group">
9+
<label class="control-label col-sm-2 col-lg-2 required" for="id_choice_field">Choice field</label>
10+
11+
<div class="col-sm-10 col-lg-10">
12+
<select name="choice_field" class=" form-control" id="id_choice_field">
13+
<option value="0">Zero</option>
14+
15+
<option value="1">One</option>
16+
17+
<option value="2">Two</option>
18+
19+
</select>
20+
</div>
21+
</div>
22+
<div class="form-group">
23+
<label class="control-label col-sm-2 col-lg-2 required">Radio choice</label>
24+
<div class="col-sm-10 col-lg-10">
25+
<div class="radio">
26+
<label>
27+
<input type="radio" name="radio_choice" value="0" id="id_radio_choice_0" required>
28+
Zero
29+
</label>
30+
</div>
31+
<div class="radio">
32+
<label>
33+
<input type="radio" name="radio_choice" value="1" id="id_radio_choice_1" required>
34+
One
35+
</label>
36+
</div>
37+
<div class="radio">
38+
<label>
39+
<input type="radio" name="radio_choice" value="2" id="id_radio_choice_2" required>
40+
Two
41+
</label>
42+
</div>
43+
44+
</div>
45+
</div>
46+
<div class="form-group">
47+
<label class="control-label col-sm-2 col-lg-2 required" for="id_multiple_choice">Multiple choice</label>
48+
49+
<div class="col-sm-10 col-lg-10">
50+
<select name="multiple_choice" class=" form-control" required id="id_multiple_choice" multiple>
51+
<option value="0">Zero</option>
52+
53+
<option value="1">One</option>
54+
55+
<option value="2">Two</option>
56+
57+
</select>
58+
</div>
59+
</div>
60+
<div class="form-group">
61+
<label class="control-label col-sm-2 col-lg-2 required" for="id_multiple_checkbox">Multiple checkbox</label>
62+
63+
<div class="col-sm-10 col-lg-10 multiple-checkbox">
64+
<ul id="id_multiple_checkbox">
65+
<li><label for="id_multiple_checkbox_0"><input type="checkbox" name="multiple_checkbox" value="0" id="id_multiple_checkbox_0">
66+
Zero</label>
67+
68+
</li>
69+
<li><label for="id_multiple_checkbox_1"><input type="checkbox" name="multiple_checkbox" value="1" id="id_multiple_checkbox_1">
70+
One</label>
71+
72+
</li>
73+
<li><label for="id_multiple_checkbox_2"><input type="checkbox" name="multiple_checkbox" value="2" id="id_multiple_checkbox_2">
74+
Two</label>
75+
76+
</li>
77+
</ul>
78+
</div>
79+
</div>
80+
<div class="form-group">
81+
<label class="control-label col-sm-2 col-lg-2 required" for="id_file_fied">File fied</label>
82+
83+
<div class="col-sm-10 col-lg-10">
84+
<input type="file" name="file_fied" required id="id_file_fied">
85+
</div>
86+
</div>
87+
<div class="form-group">
88+
<label class="control-label col-sm-2 col-lg-2 required" for="id_password_field">Password field</label>
89+
90+
<div class="col-sm-10 col-lg-10">
91+
<input type="password" name="password_field" class=" form-control" required id="id_password_field">
92+
</div>
93+
</div>
94+
<div class="form-group">
95+
<label class="control-label col-sm-2 col-lg-2 required" for="id_textarea">Textarea</label>
96+
97+
<div class="col-sm-10 col-lg-10">
98+
<textarea name="textarea" cols="40" rows="10" class=" form-control" required id="id_textarea">
99+
</textarea>
100+
</div>
101+
</div>
102+
<div class="form-group">
103+
<div class="col-sm-10 col-sm-offset-2 col-lg-10 col-lg-offset-2">
104+
<div class="checkbox">
105+
<label class="required">
106+
<input type="checkbox" name="boolean_field" required id="id_boolean_field"> <span>Boolean field</span>
107+
</label>
108+
</div>
109+
</div>
110+
</div>

‎testing/fixtures/partial.html‎ renamed to ‎testing/fixtures_30/partial.html‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,21 @@
33
<label class="control-label required" for="id_char_field">Char field</label>
44

55
<div class="">
6-
<input class=" form-control" id="id_char_field" name="char_field" type="text" required />
6+
<input type="text" name="char_field" class=" form-control" required id="id_char_field">
77
</div>
88
</div>
99

1010
<div class="form-group">
1111
<label class="control-label required" for="id_choice_field">Choice field</label>
1212

1313
<div class="">
14-
<select class=" form-control" id="id_choice_field" name="choice_field">
15-
<option value="0">Zero</option>
16-
<option value="1">One</option>
17-
<option value="2">Two</option>
14+
<select name="choice_field" class=" form-control" id="id_choice_field">
15+
<option value="0">Zero</option>
16+
17+
<option value="1">One</option>
18+
19+
<option value="2">Two</option>
20+
1821
</select>
1922
</div>
20-
</div>
23+
</div>

‎testing/fixtures/basic.html‎ renamed to ‎testing/fixtures_40/basic.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
<div class="form-group">
32
<label class="control-label required" for="id_char_field">Char field</label>
43

‎testing/fixtures/horizontal.html‎ renamed to ‎testing/fixtures_40/horizontal.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
<div class="form-group">
32
<label class="control-label col-sm-2 col-lg-2 required" for="id_char_field">Char field</label>
43

‎testing/fixtures_40/partial.html‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
2+
<div class="form-group">
3+
<label class="control-label required" for="id_char_field">Char field</label>
4+
5+
<div class="">
6+
<input type="text" name="char_field" class=" form-control" required id="id_char_field">
7+
</div>
8+
</div>
9+
10+
<div class="form-group">
11+
<label class="control-label required" for="id_choice_field">Choice field</label>
12+
13+
<div class="">
14+
<select name="choice_field" class=" form-control" id="id_choice_field">
15+
<option value="0">Zero</option>
16+
17+
<option value="1">One</option>
18+
19+
<option value="2">Two</option>
20+
21+
</select>
22+
</div>
23+
</div>

0 commit comments

Comments
 (0)