Upgrade to pyxform 1.5.1

* Recognize select questions from the question elements themselves
    instead of checking the bind type; see XLSForm/pyxform#168
* Recognize new error message when a group name matches the form name
    See XLSForm/pyxform#510
* Set `allow_choice_duplicates` to `yes` in cascade test XLSForms
    See XLSForm/pyxform#23; XLSForm/pyxform#373 (comment)
* Update tests to use `default_name` instead of relying on the XLSForm file name
    See XLSForm/pyxform#130
* Update expected XML in tests to match new pyxform behavior:
    * `<model>` becomes `<model odk:xforms-version="1.0.0">`
        * See XLSForm/pyxform#393
    * The bind type for `select` and `select1` becomes `string`
        * See XLSForm/pyxform#168
    * `calculate="concat('uuid:', uuid())"` becomes `jr:preload="uid"`
        * See XLSForm/pyxform#94

This squashed set of changes includes work from #699.
Thanks to @duvld for that contribution.

onadata/apps/api/tests/fixtures/Transportation Form.xml

@@ -2,7 +2,7 @@
 <h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:odk="http://www.opendatakit.org/xforms" xmlns:orx="http://openrosa.org/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <h:head>
     <h:title>transportation_2011_07_25</h:title>
-    <model>
+    <model odk:xforms-version="1.0.0">
       <instance>
         <transportation_2011_07_25 id="transportation_2011_07_25">
           <formhub>
@@ -46,18 +46,18 @@
           </meta>
         </transportation_2011_07_25>
       </instance>
-      <bind nodeset="/transportation_2011_07_25/transport/available_transportation_types_to_referral_facility" type="select"/>
+      <bind nodeset="/transportation_2011_07_25/transport/available_transportation_types_to_referral_facility" type="string"/>
       <bind nodeset="/transportation_2011_07_25/transport/available_transportation_types_to_referral_facility_other" relevant="selected(../available_transportation_types_to_referral_facility, 'other')" type="string"/>
-      <bind nodeset="/transportation_2011_07_25/transport/loop_over_transport_types_frequency/ambulance/frequency_to_referral_facility" relevant="selected( /transportation_2011_07_25/transport/available_transportation_types_to_referral_facility , 'ambulance')" type="select1"/>
-      <bind nodeset="/transportation_2011_07_25/transport/loop_over_transport_types_frequency/bicycle/frequency_to_referral_facility" relevant="selected( /transportation_2011_07_25/transport/available_transportation_types_to_referral_facility , 'bicycle')" type="select1"/>
-      <bind nodeset="/transportation_2011_07_25/transport/loop_over_transport_types_frequency/boat_canoe/frequency_to_referral_facility" relevant="selected( /transportation_2011_07_25/transport/available_transportation_types_to_referral_facility , 'boat_canoe')" type="select1"/>
-      <bind nodeset="/transportation_2011_07_25/transport/loop_over_transport_types_frequency/bus/frequency_to_referral_facility" relevant="selected( /transportation_2011_07_25/transport/available_transportation_types_to_referral_facility , 'bus')" type="select1"/>
-      <bind nodeset="/transportation_2011_07_25/transport/loop_over_transport_types_frequency/donkey_mule_cart/frequency_to_referral_facility" relevant="selected( /transportation_2011_07_25/transport/available_transportation_types_to_referral_facility , 'donkey_mule_cart')" type="select1"/>
-      <bind nodeset="/transportation_2011_07_25/transport/loop_over_transport_types_frequency/keke_pepe/frequency_to_referral_facility" relevant="selected( /transportation_2011_07_25/transport/available_transportation_types_to_referral_facility , 'keke_pepe')" type="select1"/>
-      <bind nodeset="/transportation_2011_07_25/transport/loop_over_transport_types_frequency/lorry/frequency_to_referral_facility" relevant="selected( /transportation_2011_07_25/transport/available_transportation_types_to_referral_facility , 'lorry')" type="select1"/>
-      <bind nodeset="/transportation_2011_07_25/transport/loop_over_transport_types_frequency/motorbike/frequency_to_referral_facility" relevant="selected( /transportation_2011_07_25/transport/available_transportation_types_to_referral_facility , 'motorbike')" type="select1"/>
-      <bind nodeset="/transportation_2011_07_25/transport/loop_over_transport_types_frequency/taxi/frequency_to_referral_facility" relevant="selected( /transportation_2011_07_25/transport/available_transportation_types_to_referral_facility , 'taxi')" type="select1"/>
-      <bind calculate="concat('uuid:', uuid())" nodeset="/transportation_2011_07_25/meta/instanceID" readonly="true()" type="string"/>
+      <bind nodeset="/transportation_2011_07_25/transport/loop_over_transport_types_frequency/ambulance/frequency_to_referral_facility" relevant="selected( /transportation_2011_07_25/transport/available_transportation_types_to_referral_facility , 'ambulance')" type="string"/>
+      <bind nodeset="/transportation_2011_07_25/transport/loop_over_transport_types_frequency/bicycle/frequency_to_referral_facility" relevant="selected( /transportation_2011_07_25/transport/available_transportation_types_to_referral_facility , 'bicycle')" type="string"/>
+      <bind nodeset="/transportation_2011_07_25/transport/loop_over_transport_types_frequency/boat_canoe/frequency_to_referral_facility" relevant="selected( /transportation_2011_07_25/transport/available_transportation_types_to_referral_facility , 'boat_canoe')" type="string"/>
+      <bind nodeset="/transportation_2011_07_25/transport/loop_over_transport_types_frequency/bus/frequency_to_referral_facility" relevant="selected( /transportation_2011_07_25/transport/available_transportation_types_to_referral_facility , 'bus')" type="string"/>
+      <bind nodeset="/transportation_2011_07_25/transport/loop_over_transport_types_frequency/donkey_mule_cart/frequency_to_referral_facility" relevant="selected( /transportation_2011_07_25/transport/available_transportation_types_to_referral_facility , 'donkey_mule_cart')" type="string"/>
+      <bind nodeset="/transportation_2011_07_25/transport/loop_over_transport_types_frequency/keke_pepe/frequency_to_referral_facility" relevant="selected( /transportation_2011_07_25/transport/available_transportation_types_to_referral_facility , 'keke_pepe')" type="string"/>
+      <bind nodeset="/transportation_2011_07_25/transport/loop_over_transport_types_frequency/lorry/frequency_to_referral_facility" relevant="selected( /transportation_2011_07_25/transport/available_transportation_types_to_referral_facility , 'lorry')" type="string"/>
+      <bind nodeset="/transportation_2011_07_25/transport/loop_over_transport_types_frequency/motorbike/frequency_to_referral_facility" relevant="selected( /transportation_2011_07_25/transport/available_transportation_types_to_referral_facility , 'motorbike')" type="string"/>
+      <bind nodeset="/transportation_2011_07_25/transport/loop_over_transport_types_frequency/taxi/frequency_to_referral_facility" relevant="selected( /transportation_2011_07_25/transport/available_transportation_types_to_referral_facility , 'taxi')" type="string"/>
+      <bind jr:preload="uid" nodeset="/transportation_2011_07_25/meta/instanceID" readonly="true()" type="string"/>
       <bind calculate="'%(form_uuid)s'" nodeset="/transportation_2011_07_25/formhub/uuid" type="string"/>
     </model>
   </h:head>

onadata/apps/api/tests/fixtures/forms/contributions/contributions.xml

@@ -21,7 +21,7 @@
       <bind nodeset="/contributions/age" type="int"/>
       <bind nodeset="/contributions/amount" type="decimal"/>
       <bind nodeset="/contributions/date_of_contribution" type="date"/>
-      <bind calculate="concat('uuid:', uuid())" nodeset="/contributions/meta/instanceID" readonly="true()" type="string"/>
+      <bind jr:preload="uid" nodeset="/contributions/meta/instanceID" readonly="true()" type="string"/>
       <bind calculate="'e24036d80c0644a9b5674178892d6b6f'" nodeset="/contributions/formhub/uuid" type="string"/>
     </model>
   </h:head>

onadata/apps/main/tests/fixtures/cascading_selects/new_cascading_select.xml

@@ -150,7 +150,7 @@
       <bind nodeset="/new_cascading_select/state" type="select1"/>
       <bind nodeset="/new_cascading_select/county" type="select1"/>
       <bind nodeset="/new_cascading_select/city" type="select1"/>
-      <bind calculate="concat('uuid:', uuid())" nodeset="/new_cascading_select/meta/instanceID" readonly="true()" type="string"/>
+      <bind jr:preload="uid" nodeset="/new_cascading_select/meta/instanceID" readonly="true()" type="string"/>
     </model>
   </h:head>
   <h:body>

onadata/apps/main/tests/fixtures/exp_line_break.xml

@@ -49,7 +49,7 @@
       <bind nodeset="/exp_line_break/photo" type="binary"/>
       <bind nodeset="/exp_line_break/kind" type="select1"/>
       <bind nodeset="/exp_line_break/required" required="true()" type="select1"/>
-      <bind calculate="concat('uuid:', uuid())" nodeset="/exp_line_break/meta/instanceID" readonly="true()" type="string"/>
+      <bind jr:preload="uid" nodeset="/exp_line_break/meta/instanceID" readonly="true()" type="string"/>
       <bind calculate="'663123a849e54bffa8f9832ef016bfac'" nodeset="/exp_line_break/formhub/uuid" type="string"/>
     </model>
   </h:head>

onadata/apps/main/tests/fixtures/transportation/Transportation Form.xml

@@ -57,7 +57,7 @@
       <bind nodeset="/transportation/transport/loop_over_transport_types_frequency/lorry/frequency_to_referral_facility" relevant="selected( /transportation/transport/available_transportation_types_to_referral_facility , 'lorry')" type="select1"/>
       <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 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>

onadata/apps/main/tests/fixtures/transportation/transportation.xml

@@ -2,7 +2,7 @@
 <h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:odk="http://www.opendatakit.org/xforms" xmlns:orx="http://openrosa.org/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <h:head>
     <h:title>transportation_2011_07_25</h:title>
-    <model>
+    <model odk:xforms-version="1.0.0">
       <instance>
         <transportation_2011_07_25 id="transportation_2011_07_25">
           <formhub>
@@ -46,18 +46,18 @@
           </meta>
         </transportation_2011_07_25>
       </instance>
-      <bind nodeset="/transportation_2011_07_25/transport/available_transportation_types_to_referral_facility" type="select"/>
+      <bind nodeset="/transportation_2011_07_25/transport/available_transportation_types_to_referral_facility" type="string"/>
       <bind nodeset="/transportation_2011_07_25/transport/available_transportation_types_to_referral_facility_other" relevant="selected(../available_transportation_types_to_referral_facility, 'other')" type="string"/>
-      <bind nodeset="/transportation_2011_07_25/transport/loop_over_transport_types_frequency/ambulance/frequency_to_referral_facility" relevant="selected( /transportation_2011_07_25/transport/available_transportation_types_to_referral_facility , 'ambulance')" type="select1"/>
-      <bind nodeset="/transportation_2011_07_25/transport/loop_over_transport_types_frequency/bicycle/frequency_to_referral_facility" relevant="selected( /transportation_2011_07_25/transport/available_transportation_types_to_referral_facility , 'bicycle')" type="select1"/>
-      <bind nodeset="/transportation_2011_07_25/transport/loop_over_transport_types_frequency/boat_canoe/frequency_to_referral_facility" relevant="selected( /transportation_2011_07_25/transport/available_transportation_types_to_referral_facility , 'boat_canoe')" type="select1"/>
-      <bind nodeset="/transportation_2011_07_25/transport/loop_over_transport_types_frequency/bus/frequency_to_referral_facility" relevant="selected( /transportation_2011_07_25/transport/available_transportation_types_to_referral_facility , 'bus')" type="select1"/>
-      <bind nodeset="/transportation_2011_07_25/transport/loop_over_transport_types_frequency/donkey_mule_cart/frequency_to_referral_facility" relevant="selected( /transportation_2011_07_25/transport/available_transportation_types_to_referral_facility , 'donkey_mule_cart')" type="select1"/>
-      <bind nodeset="/transportation_2011_07_25/transport/loop_over_transport_types_frequency/keke_pepe/frequency_to_referral_facility" relevant="selected( /transportation_2011_07_25/transport/available_transportation_types_to_referral_facility , 'keke_pepe')" type="select1"/>
-      <bind nodeset="/transportation_2011_07_25/transport/loop_over_transport_types_frequency/lorry/frequency_to_referral_facility" relevant="selected( /transportation_2011_07_25/transport/available_transportation_types_to_referral_facility , 'lorry')" type="select1"/>
-      <bind nodeset="/transportation_2011_07_25/transport/loop_over_transport_types_frequency/motorbike/frequency_to_referral_facility" relevant="selected( /transportation_2011_07_25/transport/available_transportation_types_to_referral_facility , 'motorbike')" type="select1"/>
-      <bind nodeset="/transportation_2011_07_25/transport/loop_over_transport_types_frequency/taxi/frequency_to_referral_facility" relevant="selected( /transportation_2011_07_25/transport/available_transportation_types_to_referral_facility , 'taxi')" type="select1"/>
-      <bind calculate="concat('uuid:', uuid())" nodeset="/transportation_2011_07_25/meta/instanceID" readonly="true()" type="string"/>
+      <bind nodeset="/transportation_2011_07_25/transport/loop_over_transport_types_frequency/ambulance/frequency_to_referral_facility" relevant="selected( /transportation_2011_07_25/transport/available_transportation_types_to_referral_facility , 'ambulance')" type="string"/>
+      <bind nodeset="/transportation_2011_07_25/transport/loop_over_transport_types_frequency/bicycle/frequency_to_referral_facility" relevant="selected( /transportation_2011_07_25/transport/available_transportation_types_to_referral_facility , 'bicycle')" type="string"/>
+      <bind nodeset="/transportation_2011_07_25/transport/loop_over_transport_types_frequency/boat_canoe/frequency_to_referral_facility" relevant="selected( /transportation_2011_07_25/transport/available_transportation_types_to_referral_facility , 'boat_canoe')" type="string"/>
+      <bind nodeset="/transportation_2011_07_25/transport/loop_over_transport_types_frequency/bus/frequency_to_referral_facility" relevant="selected( /transportation_2011_07_25/transport/available_transportation_types_to_referral_facility , 'bus')" type="string"/>
+      <bind nodeset="/transportation_2011_07_25/transport/loop_over_transport_types_frequency/donkey_mule_cart/frequency_to_referral_facility" relevant="selected( /transportation_2011_07_25/transport/available_transportation_types_to_referral_facility , 'donkey_mule_cart')" type="string"/>
+      <bind nodeset="/transportation_2011_07_25/transport/loop_over_transport_types_frequency/keke_pepe/frequency_to_referral_facility" relevant="selected( /transportation_2011_07_25/transport/available_transportation_types_to_referral_facility , 'keke_pepe')" type="string"/>
+      <bind nodeset="/transportation_2011_07_25/transport/loop_over_transport_types_frequency/lorry/frequency_to_referral_facility" relevant="selected( /transportation_2011_07_25/transport/available_transportation_types_to_referral_facility , 'lorry')" type="string"/>
+      <bind nodeset="/transportation_2011_07_25/transport/loop_over_transport_types_frequency/motorbike/frequency_to_referral_facility" relevant="selected( /transportation_2011_07_25/transport/available_transportation_types_to_referral_facility , 'motorbike')" type="string"/>
+      <bind nodeset="/transportation_2011_07_25/transport/loop_over_transport_types_frequency/taxi/frequency_to_referral_facility" relevant="selected( /transportation_2011_07_25/transport/available_transportation_types_to_referral_facility , 'taxi')" type="string"/>
+      <bind jr:preload="uid" nodeset="/transportation_2011_07_25/meta/instanceID" readonly="true()" type="string"/>
       <bind calculate="''" nodeset="/transportation_2011_07_25/formhub/uuid" type="string" />
     </model>
   </h:head>

onadata/apps/main/tests/fixtures/transportation/transportation2.xml

@@ -55,7 +55,7 @@
       <bind nodeset="/transportation/transport/loop_over_transport_types_frequency/lorry/frequency_to_referral_facility" relevant="selected(/transportation/transport/available_transportation_types_to_referral_facility, 'lorry')" type="select1"/>
       <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 calculate="concat('uuid:', uuid())" nodeset="/transportation/meta/instanceID" readonly="true()" type="string"/>
+      <bind jr:preload="uid" nodeset="/transportation/meta/instanceID" readonly="true()" type="string"/>
     </model>
   </h:head>
   <h:body>

onadata/apps/main/tests/test_past_bugs.py

@@ -18,7 +18,7 @@ def test_uniqueness_of_group_names_enforced(self):
         self._create_user_and_login()
         response = self._publish_xls_file(
             'fixtures/group_names_must_be_unique.xls')
-        message = 'There are two sections with the name group_names_must_be_unique.'
+        message = 'The name "group_names_must_be_unique" is the same as the form name'
         response_content = smart_text(response.content)
         self.assertTrue(message in response_content)
         self.assertEqual(XForm.objects.count(), pre_count)

onadata/apps/viewer/pandas_mongo_bridge.py

@@ -13,6 +13,7 @@
 except ImportError:
     from pandas import ExcelWriter
 
+from pyxform.constants import SELECT_ALL_THAT_APPLY
 from pyxform.survey_element import SurveyElement
 from pyxform.section import Section, RepeatingSection
 from pyxform.question import Question
@@ -40,8 +41,6 @@
 # this is Mongo Collection where we will store the parsed submissions
 xform_instances = settings.MONGO_DB.instances
 
-# the bind type of select multiples that we use to compare
-MULTIPLE_SELECT_BIND_TYPE = "select"
 GEOPOINT_BIND_TYPE = "geopoint"
 
 # column group delimiters
@@ -123,7 +122,7 @@ def _collect_select_multiples(cls, dd):
         return dict([(e.get_abbreviated_xpath(), [c.get_abbreviated_xpath()
                     for c in e.children])
                     for e in dd.get_survey_elements()
-                    if e.bind.get("type") == "select"])
+                    if e.type == SELECT_ALL_THAT_APPLY])
 
     @classmethod
     def _split_select_multiples(cls, record, select_multiples,
@@ -437,9 +436,9 @@ def _build_sections_recursive(self, section_name, element,
                 child_bind_type = child.bind.get("type")
                 if isinstance(child, Question) and not \
                         question_types_to_exclude(child.type)\
-                        and not child_bind_type == MULTIPLE_SELECT_BIND_TYPE:
+                        and not child.type == SELECT_ALL_THAT_APPLY:
                     self._add_column_to_section(section_name, child)
-                elif child_bind_type == MULTIPLE_SELECT_BIND_TYPE:
+                elif child.type == SELECT_ALL_THAT_APPLY:
                     self.select_multiples[child.get_abbreviated_xpath()] = \
                         [option.get_abbreviated_xpath()
                          for option in child.children]