Re-enable Python cyclic dependencies check

The Python module has been improved and we now use the newer version.

References CMK-20089

Change-Id: Iddb4dca4ef84c0d3fea476884a6488ab42826273

buildscripts/scripts/stages.yml

@@ -194,13 +194,12 @@ STAGES:
       RESULT_CHECK_TYPE: "GCC"
       RESULT_CHECK_FILE_PATTERN: "results/python-format.txt"
 
-    # Disabled until it is fixed, see CMK-19758
-    # - NAME: "Python Cyclic Dependencies"
-    #   ONLY_WHEN_NOT_EMPTY: CHANGED_REFERENCE_IMAGE,CHANGED_TESTS_MAKEFILE,CHANGED_PIPFILE_LOCK,CHANGED_CMK_WERKS_FILES,CHANGED_CMK_TRACE_FILES,CHANGED_FIND_PYTHON_FILES_SCRIPT,CHANGED_PYTHON_FILES
-    #   DIR: "tests"
-    #   COMMAND: "make test-cycles-docker &> ${RESULTS}/py-import-cycles.txt"
-    #   TEXT_ON_SKIP: "No Python files changed"
-    #   RESULT_CHECK_FILE_PATTERN: "results/py-import-cycles.txt"
+    - NAME: "Python Cyclic Dependencies"
+      ONLY_WHEN_NOT_EMPTY: CHANGED_REFERENCE_IMAGE,CHANGED_TESTS_MAKEFILE,CHANGED_PIPFILE_LOCK,CHANGED_CMK_WERKS_FILES,CHANGED_CMK_TRACE_FILES,CHANGED_FIND_PYTHON_FILES_SCRIPT,CHANGED_PYTHON_FILES
+      DIR: "tests"
+      COMMAND: "make test-cycles-docker &> ${RESULTS}/py-import-cycles.txt"
+      TEXT_ON_SKIP: "No Python files changed"
+      RESULT_CHECK_FILE_PATTERN: "results/py-import-cycles.txt"
 
     - NAME: "omdlib Unit Tests"
       ONLY_WHEN_NOT_EMPTY: CHANGED_REFERENCE_IMAGE,CHANGED_OMDLIB_FILES,CHANGED_OMDLIB_TESTS,CHANGED_CMK_CCC_FILES,CHANGED_CMK_CRYPTO_FILES

tests/Makefile

@@ -398,15 +398,21 @@ test-shellcheck-docker:
 test-cycles:
 	$(CYCLES) \
 		--packages \
-		    cmk \
-		    omd/packages/omd/omdlib \
-		    packages/cmk-agent-based/cmk/agent_based \
-		    packages/cmk-agent-receiver/cmk/agent_receiver \
-		    packages/cmk-graphing/cmk/graphing \
-		    packages/cmk-werks/cmk/werks \
-		    packages/cmk-werks/cmk/trace \
-		--project-path $$(realpath -L ..) \
+			$$(realpath -L ..)/cmk \
+			$$(realpath -L ..)/packages/cmk-agent-based/cmk \
+			$$(realpath -L ..)/packages/cmk-agent-receiver/cmk \
+			$$(realpath -L ..)/packages/cmk-crypto/cmk \
+			$$(realpath -L ..)/packages/cmk-graphing/cmk \
+			$$(realpath -L ..)/packages/cmk-livestatus-client/cmk \
+			$$(realpath -L ..)/packages/cmk-messaging/cmk \
+			$$(realpath -L ..)/packages/cmk-mkp-tool/cmk \
+			$$(realpath -L ..)/packages/cmk-rulesets/cmk \
+			$$(realpath -L ..)/packages/cmk-server-side-calls/cmk \
+			$$(realpath -L ..)/packages/cmk-werks/cmk \
+			$$(realpath -L ..)/packages/cmk-trace/cmk \
+			$$(realpath -L ..)/omd/packages/omd/omdlib \
 		--strategy johnson \
+		--threshold 87 \
 		--verbose
 
 test-cycles-docker: