From 964e82ff41fd09f825b92bf9b22aafd722cdba50 Mon Sep 17 00:00:00 2001
From: Stephan Seitz <stephan.seitz@fau.de>
Date: Wed, 21 Aug 2019 17:54:01 +0200
Subject: [PATCH] conftest: this file should be added to waLBerla
The line is only need when running pytest form the root directory
---
conftest.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/conftest.py b/conftest.py
index 4d85ef0c5..85e5e6b85 100644
--- a/conftest.py
+++ b/conftest.py
@@ -57,6 +57,8 @@ try:
except ImportError:
collect_ignore += [os.path.join(SCRIPT_FOLDER, "pystencils_tests/test_aligned_array.py"),
os.path.join(SCRIPT_FOLDER, "pystencils_tests/test_datahandling_parallel.py"),
+ os.path.join(SCRIPT_FOLDER, "doc/notebooks/03_tutorial_datahandling.ipynb"),
+ os.path.join(SCRIPT_FOLDER, "pystencils/datahandling/parallel_datahandling.py"),
os.path.join(SCRIPT_FOLDER, "pystencils_tests/test_small_block_benchmark.ipynb")]
try:
--
GitLab