Merge pull request #634 from chainer/disable-edible-for-cupy

No editable install for cupy
chainer · Feb 23, 2021 · d81d28f · d81d28f
2 parents 177860e + dc365d6
commit d81d28f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/test_cupy.sh b/test_cupy.sh
@@ -2,9 +2,7 @@
 
 . ./environment.sh
 
-pip install --user -e cupy/[jenkins]
-
-cd cupy
+pip install --user cupy/[jenkins]
 
 # Shows cupy config before running the tests
 python -c 'import cupy; cupy.show_config()'
@@ -26,14 +24,19 @@ else
   pytest_opts+=(-m 'not slow')
 fi
 
-python -m pytest "${pytest_opts[@]}" tests
+pushd cupy
+python -m pytest "${pytest_opts[@]}" tests/install_tests
+popd
+
+pushd cupy/tests
+python -m pytest "${pytest_opts[@]}" cupy_tests cupyx_tests example_tests
 
 # Submit coverage to Coveralls
-python ../push_coveralls.py
+python ../../push_coveralls.py
 
 # Submit coverage to Codecov
 # Codecov uses `coverage.xml` generated from `.coverage`
-python -m coverage xml
+python -m coverage xml --ignore-errors
 python -m codecov
 
 # Run benchmark on Python 3
@@ -44,3 +47,5 @@ if [ "$(python -c 'import sys; print(sys.version_info.major)')" = "3" ]; then
   python run.py --show-gpu
   popd
 fi
+
+popd
diff --git a/test_cupy_doc.sh b/test_cupy_doc.sh
@@ -2,7 +2,7 @@
 
 . ./environment.sh
 
-pip install --user -e cupy/[jenkins]
+pip install --user cupy/[jenkins]
 
 cd cupy/docs
 

diff --git a/test_cupy_slow.sh b/test_cupy_slow.sh
@@ -2,9 +2,7 @@
 
 . ./environment.sh
 
-pip install --user -e cupy/[jenkins]
-
-cd cupy
+pip install --user cupy/[jenkins]
 
 export CUPY_DUMP_CUDA_SOURCE_ON_ERROR=1
 
@@ -23,4 +21,10 @@ else
   pytest_opts+=(-m 'slow')
 fi
 
-python -m pytest "${pytest_opts[@]}" tests
+pushd cupy
+python -m pytest "${pytest_opts[@]}" tests/install_tests
+popd
+
+pushd cupy/tests
+python -m pytest "${pytest_opts[@]}" cupy_tests cupyx_tests example_tests
+popd