Commit 1fad2d87 authored by Martin Bauer's avatar Martin Bauer
Browse files

Merge branch 'contest2' into 'master'

Contest: ignore two more files if waLBerla is not available

See merge request pycodegen/pystencils!40
parents 62e03ae4 c3fcfb31
...@@ -33,6 +33,8 @@ add_path_to_ignore('pystencils_tests/benchmark') ...@@ -33,6 +33,8 @@ add_path_to_ignore('pystencils_tests/benchmark')
add_path_to_ignore('_local_tmp') add_path_to_ignore('_local_tmp')
collect_ignore += [os.path.join(SCRIPT_FOLDER, "pystencils/autodiff.py")]
try: try:
import pycuda import pycuda
except ImportError: except ImportError:
...@@ -57,6 +59,8 @@ try: ...@@ -57,6 +59,8 @@ try:
except ImportError: except ImportError:
collect_ignore += [os.path.join(SCRIPT_FOLDER, "pystencils_tests/test_aligned_array.py"), 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_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")] os.path.join(SCRIPT_FOLDER, "pystencils_tests/test_small_block_benchmark.ipynb")]
try: try:
......
...@@ -8,7 +8,5 @@ Installation: ...@@ -8,7 +8,5 @@ Installation:
.. code-block:: bash .. code-block:: bash
pip install pystencils-autodiff pip install pystencils-autodiff
""" """
import os
if 'CI' not in os.environ: raise NotImplementedError('pystencils-autodiff is not installed. Run `pip install pystencils-autodiff`')
raise NotImplementedError('pystencils-autodiff is not installed. Run `pip install pystencils-autodiff`')
Markdown is supported
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