Merge branch 'conftest-waLBerla-kerncraft' into 'master'

Conftest: waLBerla, kerncraft

See merge request !39

conftest.py

@@ -48,9 +48,17 @@ except ImportError:
 try:
     import kerncraft
 except ImportError:
-    collect_ignore += [os.path.join(SCRIPT_FOLDER, "pystencils_tests/test_kerncraft_coupling.py")]
+    collect_ignore += [os.path.join(SCRIPT_FOLDER, "pystencils_tests/test_kerncraft_coupling.py"),
+                       os.path.join(SCRIPT_FOLDER, "pystencils_tests/benchmark/benchmark.py")]
     add_path_to_ignore('pystencils/kerncraft_coupling')
 
+try:
+    import waLBerla
+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, "pystencils_tests/test_small_block_benchmark.ipynb")]
+
 try:
     import blitzdb
 except ImportError: