tricc-oo 1.4.26__py3-none-any.whl → 1.4.27__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. tricc_oo/models/ordered_set.py +1 -1
  2. tricc_oo/serializers/xls_form.py +0 -2
  3. tricc_oo/visitors/tricc.py +1 -1
  4. {tricc_oo-1.4.26.dist-info → tricc_oo-1.4.27.dist-info}/METADATA +1 -1
  5. {tricc_oo-1.4.26.dist-info → tricc_oo-1.4.27.dist-info}/RECORD +7 -7
  6. {tricc_oo-1.4.26.dist-info → tricc_oo-1.4.27.dist-info}/WHEEL +0 -0
  7. {tricc_oo-1.4.26.dist-info → tricc_oo-1.4.27.dist-info}/top_level.txt +0 -0
tricc_oo/models/ordered_set.py CHANGED
@@ -106,7 +106,7 @@ class OrderedSet(Sequence):
106
106
 
107
107
  # If the object is not in the OrderedSet, start from the end
108
108
  if obj not in self._od:
109
- start_index = len(keys) - 1
109
+ start_index = len(keys)
110
110
  else:
111
111
  # Find the index of the given object
112
112
  start_index = keys.index(obj)
tricc_oo/serializers/xls_form.py CHANGED
@@ -21,8 +21,6 @@ from tricc_oo.visitors.tricc import (
21
21
  get_applicability_expression,
22
22
  get_prev_instance_skip_expression,
23
23
  get_process_skip_expression,
24
- get_next_version,
25
- set_last_version_false,
26
24
  )
27
25
 
28
26
  logger = logging.getLogger("default")
tricc_oo/visitors/tricc.py CHANGED
@@ -96,7 +96,7 @@ def get_node_expressions(node, processed_nodes, process=None):
96
96
  def set_last_version_false(node, processed_nodes):
97
97
  node_name = node.name if not isinstance(node, TriccNodeEnd) else node.get_reference()
98
98
  #last_version = get_last_version(node_name, processed_nodes) if issubclass(node.__class__, (TriccNodeDisplayModel, TriccNodeDisplayCalculateBase, TriccNodeEnd)) and not isinstance(node, TriccNodeSelectOption) else None
99
- last_version = processed_nodes.find_prev(node, lambda item: item.id != node.id and hasattr(item, 'name') and item.name == node.name and issubclass(node.__class__, (TriccNodeDisplayModel, TriccNodeDisplayCalculateBase, TriccNodeEnd)) and not isinstance(node, TriccNodeSelectOption))
99
+ last_version = processed_nodes.find_prev(node, lambda item: item.id != node.id and hasattr(item, 'name') and item.name == node_name and issubclass(item.__class__, (TriccNodeDisplayModel, TriccNodeDisplayCalculateBase, TriccNodeEnd)) and not isinstance(item, TriccNodeSelectOption))
100
100
  if last_version and getattr(node, 'process', '') != 'pause':
101
101
  # 0-100 for manually specified instance. 100-200 for auto instance
102
102
  node.version = get_next_version(node.name, processed_nodes, last_version.version + 1, 0)
{tricc_oo-1.4.26.dist-info → tricc_oo-1.4.27.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: tricc-oo
3
- Version: 1.4.26
3
+ Version: 1.4.27
4
4
  Summary: Python library that converts CDSS L2 in L3
5
5
  Project-URL: Homepage, https://github.com/SwissTPH/tricc
6
6
  Project-URL: Issues, https://github.com/SwissTPH/tricc/issues
{tricc_oo-1.4.26.dist-info → tricc_oo-1.4.27.dist-info}/RECORD RENAMED
@@ -19,13 +19,13 @@ tricc_oo/models/base.py,sha256=6YU4FrUT4gE6WlERR1OPvQpq3bBKzG38I68_SZmaAao,24386
19
19
  tricc_oo/models/calculate.py,sha256=Bw7OGa4OYxHP529wA23CZftMYDL_CA0SPQ0j1IFyTNA,7456
20
20
  tricc_oo/models/lang.py,sha256=SwKaoxyRhE7gH_ZlYyFXzGuTQ5RE19y47LWAA35zYxg,2338
21
21
  tricc_oo/models/ocl.py,sha256=ol35Gl1jCBp0Ven0yxOKzDIZkVL5Kx9uwaR_64pjxKI,8931
22
- tricc_oo/models/ordered_set.py,sha256=cdvqlWgbwN0Jl7btssEoXbzQJ2rlMzxGILRblMqjRg0,4182
22
+ tricc_oo/models/ordered_set.py,sha256=wbbmppjgKy0xcKD9kIAbT4kgNkuwTILPxRw_KAAoPEY,4178
23
23
  tricc_oo/models/tricc.py,sha256=32WvBVBShODBlszdXSoCjisd5gpt6CM_TNabJap1Zfs,16509
24
24
  tricc_oo/parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
25
25
  tricc_oo/parsers/xml.py,sha256=vq9PA5Zt4G3QMtZ1zgyN8110O1w19Jqt6JClJYhHJlU,4410
26
26
  tricc_oo/serializers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
27
27
  tricc_oo/serializers/planuml.py,sha256=a81YKsjgng-h2H_rmFE2J5FeBBUaH8kRGT8YrvzpEKE,455
28
- tricc_oo/serializers/xls_form.py,sha256=LSCZV05Uw-SeKsbWRircMRJLLQtfDDxeo4qqqdIoI5Q,22757
28
+ tricc_oo/serializers/xls_form.py,sha256=oaBfHGJ_I_7qAPuxdG361PCaEKo1TD1LUvHJvo0kYlk,22707
29
29
  tricc_oo/strategies/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
30
30
  tricc_oo/strategies/input/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
31
31
  tricc_oo/strategies/input/base_input_strategy.py,sha256=-GQ_xRvJXzn-q_eT8R-wtFOTWzPtdNj79zjmsH6x070,4065
@@ -37,10 +37,10 @@ tricc_oo/strategies/output/xlsform_cdss.py,sha256=8oLlgS1Hr6IVvI0O71kIk5oIKXbt2l
37
37
  tricc_oo/strategies/output/xlsform_cht.py,sha256=SWu1GKI5PScSX420RiVVaCNCTINeTeLpCoX-zXQIhUE,19486
38
38
  tricc_oo/strategies/output/xlsform_cht_hf.py,sha256=0D_H68a2S7oLKJENEePaRGIocrRIF45BofHlLOtGsKo,2206
39
39
  tricc_oo/visitors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
40
- tricc_oo/visitors/tricc.py,sha256=HELyOpFo_-AHsegjK0tbnyRtWOhtK9sPr3r7uN8GsEs,98055
40
+ tricc_oo/visitors/tricc.py,sha256=uhOrvms76JIF7EFOzse68IaE6zz4JexeYECML3-eUaA,98055
41
41
  tricc_oo/visitors/utils.py,sha256=Gol4JNozPEd30Q1l8IPIPhx5fqVyy9R81GofGVebgD8,484
42
42
  tricc_oo/visitors/xform_pd.py,sha256=HfcpbeeW--Q1wrRrF_uMoPATkzUxMGO5KvXtlPMG31o,9474
43
- tricc_oo-1.4.26.dist-info/METADATA,sha256=DXqZoqrx1dWylZpGBaQJKDHQzKWWRIoCwLFCNt2DLqs,7878
44
- tricc_oo-1.4.26.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
45
- tricc_oo-1.4.26.dist-info/top_level.txt,sha256=NvbfMNAiy9m4b1unBsqpeOQWh4IgA1Xa33BtKA4abxk,15
46
- tricc_oo-1.4.26.dist-info/RECORD,,
43
+ tricc_oo-1.4.27.dist-info/METADATA,sha256=4F4fGRYQGhEdNNu3vbhm1L39-cfWaSAZYkk5V1Ciykk,7878
44
+ tricc_oo-1.4.27.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
45
+ tricc_oo-1.4.27.dist-info/top_level.txt,sha256=NvbfMNAiy9m4b1unBsqpeOQWh4IgA1Xa33BtKA4abxk,15
46
+ tricc_oo-1.4.27.dist-info/RECORD,,