Skip to content

Commit eb899aa

Browse files
committed
Merge branch 'main' of github.com:Pylons/deform into main
2 parents 9a11048 + 33556f3 commit eb899aa

4 files changed

Lines changed: 3 additions & 15 deletions

File tree

.github/workflows/ci-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
sudo apt-get install gettext
8080
- name: Set URL environment variable
8181
run: |
82-
echo "URL=http://`hostname -i`:8522" >> $GITHUB_ENV
82+
echo "URL=http://`hostname -i`:8523" >> $GITHUB_ENV
8383
echo "URL: "$URL
8484
- name: Run functional web tests
8585
run: |

contributing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ Set the `WEBDRIVER` environment variable using one of the following options.
227227

228228
Set the `URL` environment variable.
229229

230-
export URL=http://<lan_ip_address>:8522
230+
export URL=http://<lan_ip_address>:8523
231231

232232
If you do not know your LAN IP address, try the command:
233233

deform/templates/selectize.pt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,6 @@
99
autofocus autofocus|field.autofocus"
1010
tal:omit-tag="">
1111

12-
<style>
13-
14-
.select2-selection.form-control {
15-
padding: 0px 0px;
16-
}
17-
18-
.select2-container--default .select2-selection--multiple,
19-
.select2-container--default .select2-selection--single {
20-
border: 1px solid #ccc;
21-
}
22-
23-
</style>
2412
<input type="hidden" name="__start__" value="${name}:sequence"
2513
tal:condition="multiple" />
2614

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def readfile(name):
7373

7474
# Selenium 4.0 does not work on Python 3.6.
7575
if PY37MIN:
76-
functional_testing_extras.extend(["selenium >= 4.0a"])
76+
functional_testing_extras.extend(["selenium >= 4.0a, < 4.0.0.b1"])
7777
else:
7878
functional_testing_extras.extend(["selenium >= 3.0, < 4.0"])
7979

0 commit comments

Comments
 (0)