Merge remote-tracking branch 'upstream/hotfixes' into release

pm4py · Oct 9, 2023 · f13a387 · f13a387
2 parents f76addf + 926d5eb
commit f13a387
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/examples/execute_everything.py b/examples/execute_everything.py
@@ -3,12 +3,6 @@
 import sys
 import traceback
 
-import pm4py
-
-pm4py.util.constants.SHOW_PROGRESS_BAR = True
-pm4py.util.constants.SHOW_EVENT_LOG_DEPRECATION = False
-pm4py.util.constants.DEFAULT_TIMESTAMP_PARSE_FORMAT = None
-
 
 def declare_simple():
     from examples import declare_simple
@@ -816,6 +810,13 @@ def execute_script(f):
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))))
 
+import pm4py
+
+pm4py.util.constants.SHOW_PROGRESS_BAR = True
+pm4py.util.constants.SHOW_EVENT_LOG_DEPRECATION = False
+pm4py.util.constants.SHOW_INTERNAL_WARNINGS = False
+#pm4py.util.constants.DEFAULT_TIMESTAMP_PARSE_FORMAT = None
+
 if __name__ == "__main__":
     execute_script(declare_simple)
     execute_script(log_skeleton_manual_constraints)

diff --git a/tests/execute_tests.py b/tests/execute_tests.py
@@ -12,7 +12,7 @@
     pm4py.util.constants.SHOW_PROGRESS_BAR = False
     pm4py.util.constants.SHOW_EVENT_LOG_DEPRECATION = False
     pm4py.util.constants.SHOW_INTERNAL_WARNINGS = False
-    pm4py.util.constants.DEFAULT_TIMESTAMP_PARSE_FORMAT = None
+    #pm4py.util.constants.DEFAULT_TIMESTAMP_PARSE_FORMAT = None
 
     from tests.doc_tests import DocTests
     from tests.role_detection import RoleDetectionTest