From 32d0f12477793e41e9da573d405ee4487eb76a58 Mon Sep 17 00:00:00 2001
From: Frederik Hennig <frederik.hennig@fau.de>
Date: Fri, 19 Jul 2024 16:30:57 +0200
Subject: [PATCH] fix CI and conftest
---
.gitlab-ci.yml | 2 +-
conftest.py | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bbc642cc..4555ae31 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -265,7 +265,7 @@ build-documentation:
pages:
image: i10git.cs.fau.de:5005/pycodegen/pycodegen/full
stage: deploy
- needs: ["build-documentation"]
+ needs: ["tests-and-coverage", "build-documentation"]
script:
- ls -l
- mv coverage_report html_doc
diff --git a/conftest.py b/conftest.py
index bcd5b70d..e1211e53 100644
--- a/conftest.py
+++ b/conftest.py
@@ -10,15 +10,15 @@ import pathlib
import nbformat
from nbconvert import PythonExporter
import sympy
+
+from lbmpy._compat import IS_PYSTENCILS_2
+
# Trigger config file reading / creation once - to avoid race conditions when multiple instances are creating it
# at the same time
-try:
- # only for pystencils 1.x
+if IS_PYSTENCILS_2:
from pystencils.backend.jit import legacy_cpu
-except ImportError:
- pass
-
-from lbmpy._compat import IS_PYSTENCILS_2
+else:
+ from pystencils.cpu import cpujit
# trigger cython imports - there seems to be a problem when multiple processes try to compile the same cython file
# at the same time
--
GitLab