Skip to content
Snippets Groups Projects
Commit 32d0f124 authored by Frederik Hennig's avatar Frederik Hennig
Browse files

fix CI and conftest

parent 91688bb2
1 merge request!172Draft: Changes for compatibility with pystencils 2.0
Pipeline #67761 failed with stages
in 16 minutes and 13 seconds
...@@ -265,7 +265,7 @@ build-documentation: ...@@ -265,7 +265,7 @@ build-documentation:
pages: pages:
image: i10git.cs.fau.de:5005/pycodegen/pycodegen/full image: i10git.cs.fau.de:5005/pycodegen/pycodegen/full
stage: deploy stage: deploy
needs: ["build-documentation"] needs: ["tests-and-coverage", "build-documentation"]
script: script:
- ls -l - ls -l
- mv coverage_report html_doc - mv coverage_report html_doc
......
...@@ -10,15 +10,15 @@ import pathlib ...@@ -10,15 +10,15 @@ import pathlib
import nbformat import nbformat
from nbconvert import PythonExporter from nbconvert import PythonExporter
import sympy 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 # Trigger config file reading / creation once - to avoid race conditions when multiple instances are creating it
# at the same time # at the same time
try: if IS_PYSTENCILS_2:
# only for pystencils 1.x
from pystencils.backend.jit import legacy_cpu from pystencils.backend.jit import legacy_cpu
except ImportError: else:
pass from pystencils.cpu import cpujit
from lbmpy._compat import IS_PYSTENCILS_2
# trigger cython imports - there seems to be a problem when multiple processes try to compile the same cython file # trigger cython imports - there seems to be a problem when multiple processes try to compile the same cython file
# at the same time # at the same time
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment