Upgrade pyxform version to 1.15.1

- Fix failing tests related to the change in /meta/instanceID binding More info: XLSForm/pyxform#94 - Fix failing test related to a change in the PyXform error raised when an invalid XML tag is found. More info: XLSForm/pyxform#22
onaio · Jan 28, 2020 · 4b9d73b · 4b9d73b
1 parent f19c8d4
commit 4b9d73b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/onadata/apps/main/tests/fixtures/transportation/transportation.xml b/onadata/apps/main/tests/fixtures/transportation/transportation.xml
@@ -59,7 +59,7 @@
       <bind nodeset="/transportation/transport/loop_over_transport_types_frequency/motorbike/frequency_to_referral_facility" relevant="selected( /transportation/transport/available_transportation_types_to_referral_facility , 'motorbike')" type="select1"/>
       <bind nodeset="/transportation/transport/loop_over_transport_types_frequency/taxi/frequency_to_referral_facility" relevant="selected( /transportation/transport/available_transportation_types_to_referral_facility , 'taxi')" type="select1"/>
       <bind nodeset="/transportation/image1" type="binary"/>
-      <bind calculate="concat('uuid:', uuid())" nodeset="/transportation/meta/instanceID" readonly="true()" type="string"/>
+      <bind jr:preload="uid" nodeset="/transportation/meta/instanceID" readonly="true()" type="string"/>
       <bind calculate="''" nodeset="/transportation/formhub/uuid" type="string"/>
     </model>
   </h:head>

diff --git a/onadata/apps/main/tests/test_form_errors.py b/onadata/apps/main/tests/test_form_errors.py
@@ -93,9 +93,10 @@ def test_spaced_xlsform(self):
         self.xform.save()
         xls_path = os.path.join(self.this_directory, "fixtures",
                                 "transportation", "tutorial .xls")
-        msg = u"The name 'tutorial ' is an invalid xml tag. Names must begin"\
-            u" with a letter, colon, or underscore, subsequent characters "\
-            u"can include numbers, dashes, and periods"
+        msg = ("The name 'tutorial ' is an invalid XML tag, it contains an"
+               " invalid character ' '. Names must begin with a letter, colon,"
+               " or underscore, subsequent characters can include numbers, "
+               "dashes and periods")
         self.assertRaisesMessage(
             PyXFormError, msg, self._publish_xls_file, xls_path)
         self.assertEquals(XForm.objects.count(), count)
diff --git a/onadata/libs/tests/serializers/test_merged_xform_serializer.py b/onadata/libs/tests/serializers/test_merged_xform_serializer.py
@@ -235,7 +235,7 @@ def test_get_merged_xform_survey(self):
                     u'name': u'instanceID',
                     u'bind': {
                         u'readonly': u'true()',
-                        u'calculate': u"concat('uuid:', uuid())"
+                        u'jr:preload': u"uid"
                     },
                     u'type': u'calculate'
                 }],
@@ -314,7 +314,7 @@ def test_group_merged_xform_survey(self):
                     u'name': u'instanceID',
                     u'bind': {
                         u'readonly': u'true()',
-                        u'calculate': u"concat('uuid:', uuid())"
+                        u'jr:preload': u"uid"
                     },
                     u'type': u'calculate'
                 }],
@@ -391,7 +391,7 @@ def test_repeat_merged_xform_survey(self):
                     u'name': u'instanceID',
                     u'bind': {
                         u'readonly': u'true()',
-                        u'calculate': u"concat('uuid:', uuid())"
+                        u'jr:preload': u'uid'
                     },
                     u'type': u'calculate'
                 }],
@@ -431,7 +431,7 @@ def test_matching_fields_by_type(self):
                     u'name': u'instanceID',
                     u'bind': {
                         u'readonly': u'true()',
-                        u'calculate': u"concat('uuid:', uuid())"
+                        u'jr:preload': u'uid'
                     },
                     u'type': u'calculate'
                 }],

diff --git a/requirements/base.pip b/requirements/base.pip
@@ -103,7 +103,7 @@ pyrsistent==0.15.1        # via jsonschema
 python-dateutil==2.8.0    # via fleming, tableschema
 python-memcached==1.59
 pytz==2019.1              # via babel, celery, django, django-query-builder, fleming
-pyxform==0.13.1
+pyxform==0.15.1
 raven==6.10.0
 recaptcha-client==1.0.6
 requests-mock==1.6.0