tricc-oo 1.4.26__tar.gz → 1.4.27__tar.gz

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 (51) hide show
  1. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/PKG-INFO +1 -1
  2. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/pyproject.toml +1 -1
  3. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/models/ordered_set.py +1 -1
  4. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/serializers/xls_form.py +0 -2
  5. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/visitors/tricc.py +1 -1
  6. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo.egg-info/PKG-INFO +1 -1
  7. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/README.md +0 -0
  8. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/setup.cfg +0 -0
  9. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tests/build.py +0 -0
  10. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tests/test_cql.py +0 -0
  11. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tests/to_ocl.py +0 -0
  12. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/__init__.py +0 -0
  13. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/converters/__init__.py +0 -0
  14. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/converters/codesystem_to_ocl.py +0 -0
  15. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/converters/cql/cqlLexer.py +0 -0
  16. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/converters/cql/cqlListener.py +0 -0
  17. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/converters/cql/cqlParser.py +0 -0
  18. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/converters/cql/cqlVisitor.py +0 -0
  19. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/converters/cql_to_operation.py +0 -0
  20. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/converters/datadictionnary.py +0 -0
  21. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/converters/drawio_type_map.py +0 -0
  22. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/converters/tricc_to_xls_form.py +0 -0
  23. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/converters/utils.py +0 -0
  24. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/converters/xml_to_tricc.py +0 -0
  25. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/models/__init__.py +0 -0
  26. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/models/base.py +0 -0
  27. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/models/calculate.py +0 -0
  28. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/models/lang.py +0 -0
  29. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/models/ocl.py +0 -0
  30. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/models/tricc.py +0 -0
  31. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/parsers/__init__.py +0 -0
  32. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/parsers/xml.py +0 -0
  33. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/serializers/__init__.py +0 -0
  34. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/serializers/planuml.py +0 -0
  35. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/strategies/__init__.py +0 -0
  36. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/strategies/input/__init__.py +0 -0
  37. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/strategies/input/base_input_strategy.py +0 -0
  38. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/strategies/input/drawio.py +0 -0
  39. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/strategies/output/base_output_strategy.py +0 -0
  40. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/strategies/output/spice.py +0 -0
  41. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/strategies/output/xls_form.py +0 -0
  42. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/strategies/output/xlsform_cdss.py +0 -0
  43. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/strategies/output/xlsform_cht.py +0 -0
  44. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/strategies/output/xlsform_cht_hf.py +0 -0
  45. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/visitors/__init__.py +0 -0
  46. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/visitors/utils.py +0 -0
  47. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo/visitors/xform_pd.py +0 -0
  48. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo.egg-info/SOURCES.txt +0 -0
  49. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo.egg-info/dependency_links.txt +0 -0
  50. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo.egg-info/requires.txt +0 -0
  51. {tricc_oo-1.4.26 → tricc_oo-1.4.27}/tricc_oo.egg-info/top_level.txt +0 -0
@@ -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
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
4
4
 
5
5
  [project]
6
6
  name = "tricc-oo"
7
- version = "1.4.26"
7
+ version = "1.4.27"
8
8
  description = "Python library that converts CDSS L2 in L3"
9
9
  readme = "README.md"
10
10
  requires-python = ">=3.8"
@@ -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)
@@ -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")
@@ -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)
@@ -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
File without changes
File without changes
File without changes
File without changes
File without changes