[allura] 14/14: [#8320] upgrade formencode, plus easywidgets related fix

[br...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

brondsem pushed a commit to branch db/8320
in repository https://gitbox.apache.org/repos/asf/allura.git

commit 75d20909a619e8ba8b77c479f8a756ee387be62a
Author: Dave Brondsema <da...@brondsema.net>
AuthorDate: Wed Jul 31 16:35:50 2019 -0400

    [#8320] upgrade formencode, plus easywidgets related fix
---
 Allura/allura/tests/functional/test_admin.py | 9 ++++++++-
 requirements.in                              | 5 +++--
 requirements.txt                             | 4 ++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Allura/allura/tests/functional/test_admin.py b/Allura/allura/tests/functional/test_admin.py
index f2a2a2c..a0dfd3f 100644
--- a/Allura/allura/tests/functional/test_admin.py
+++ b/Allura/allura/tests/functional/test_admin.py
@@ -165,10 +165,17 @@ class TestProjectAdmin(TestController):
         proj = M.Project.query.get(shortname='test')
         assert_equals(proj.features, [])
         with audits(u"change project features to \[u'One', u'Two'\]"):
-            self.app.post('/admin/update', params={
+            resp = self.app.post('/admin/update', params={
                 'features-0.feature': 'One',
                 'features-1.feature': '  ',
                 'features-2.feature': ' Two '})
+            if resp.status_int == 200:
+                errors = resp.html.findAll('', attrs={'class': 'fielderror'})
+                assert_equals([], errors)
+                errors = resp.html.findAll('', attrs={'class': 'error'})
+                assert_equals([], errors)
+                raise AssertionError('Should be a 301 not 200 response')
+
         r = self.app.get('/admin/overview')
         features = r.html.find('div', {'id': 'features'})
         features = features.findAll('input', {'type': 'text'})
diff --git a/requirements.in b/requirements.in
index e96b209..bceb9aa 100644
--- a/requirements.in
+++ b/requirements.in
@@ -7,11 +7,12 @@ chardet
 colander==1.7.0
 cryptography==2.6.1
 decorator
-EasyWidgets==0.3.2
+EasyWidgets>=0.3.3
 emoji==0.5.1
 faulthandler
 feedparser==5.1.3
-FormEncode==1.2.4
+# FormEncode may need v2.0 to work past py3.3 or so?  https://github.com/formencode/formencode/issues/140
+FormEncode
 GitPython==2.1.11
 html5lib==1.0.1
 Jinja2==2.10
diff --git a/requirements.txt b/requirements.txt
index 864cb05..62422fa 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -26,12 +26,12 @@ cryptography==2.6.1
 datadiff==2.0.0
 decorator==4.4.0
 docutils==0.14            # via pypeline
-easywidgets==0.3.2
+easywidgets==0.3.3
 emoji==0.5.1
 enum34==1.1.6             # via astroid, colander, cryptography, traitlets
 faulthandler==3.1
 feedparser==5.1.3
-formencode==1.2.4
+formencode==1.3.1
 funcsigs==1.0.2           # via beaker, mock
 future==0.17.1            # via timermiddleware
 futures==3.3.0            # via isort