From 1d59cddac1dbe0c1e583856ac1934c4389304964 Mon Sep 17 00:00:00 2001
From: Richard Bowman <richard.bowman@cantab.net>
Date: Tue, 3 Dec 2024 14:19:36 +0000
Subject: [PATCH] Disable pytest code quality report

Code quality report plugin clashes with the version of pytest specced in labthings.

If we resolve this upstream, we can re-enable it.
---
 .gitlab-ci.yml | 9 +++++----
 pyproject.toml | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b1483b1d..04d32ccb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -87,11 +87,12 @@ mypy:
 pytest:
   stage: testing
   extends: .python
-  script: >
-    - pytest --cov --cov-report term 
+  script:
+    - >
+      pytest --cov --cov-report term
       --cov-report xml:coverage.xml
       --junitxml=report.xml
-      --gitlab-code-quality-report=pytest-warnings.json
+#      --gitlab-code-quality-report=pytest-warnings.json # can restore when it installs ok
   coverage: '/(?i)total.*? (100(?:\.0+)?\%|[1-9]?\d(?:\.\d+)?\%)$/'
   artifacts:
     when: always
@@ -99,7 +100,7 @@ pytest:
       - report.xml
     reports:
       junit: report.xml
-      codequality: pytest-warnings.json
+#      codequality: pytest-warnings.json
       coverage_report:
         coverage_format: cobertura
         path: coverage.xml
diff --git a/pyproject.toml b/pyproject.toml
index 3a69ef5e..7e2d85e7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -32,7 +32,7 @@ dev = [
   "ruff",
   "mypy[reports]",
   "mypy-gitlab-code-quality",
-  "pytest-gitlab-code-quality",
+#  "pytest-gitlab-code-quality", # pytest version constraint clashes with labthings
   "pytest",
 ]
 pi = [