Commit 838ea324 authored by Thomas Vincent's avatar Thomas Vincent
Browse files

Merge branch 'pytest-support' into 'main'

Switch to pytest

See merge request !1
parents 36b6280c 0b1c0aeb
Pipeline #49329 passed with stages
in 45 minutes and 2 seconds
......@@ -81,7 +81,7 @@ macos_wheel_python39:
- pip install numpy pybind11
# Install pyopencl first to use a wheel from silx.org under Windows
- pip install --find-links http://www.silx.org/pub/wheelhouse/ --trusted-host www.silx.org --prefer-binary pyopencl
- pip install --pre --find-links artifacts/ --only-binary silx silx[full]
- pip install --pre --find-links artifacts/ --only-binary silx silx[full,test]
- python -c "import silx.test, sys; sys.exit(silx.test.run_tests());"
......@@ -120,8 +120,9 @@ windows_test_python39:
# Install pyopencl first to use a wheel from silx.org under Windows
- pip install --find-links http://www.silx.org/pub/wheelhouse/ --trusted-host www.silx.org --prefer-binary pyopencl
# Install latest compatible version of PyQt5 with macos 10.12
- pip install pyqt5==5.15.0
- pip install --pre --find-links artifacts/ --only-binary silx silx[full]
- pip install pyqt5==5.13.2
- pip install --pre --find-links artifacts/ --only-binary silx silx[full,test]
# Do not run GUI tests and OpenCL ones
- python -c "import silx.test, sys; sys.exit(silx.test.run_tests());"
......@@ -159,7 +160,7 @@ macos_test_python39:
- pip install numpy pybind11
# Install pyopencl first to use a wheel from silx.org under Windows
- pip install --find-links http://www.silx.org/pub/wheelhouse/ --trusted-host www.silx.org --prefer-binary pyopencl
- pip install --pre --find-links artifacts/ --only-binary silx silx[full]
- pip install --pre --find-links artifacts/ --only-binary silx silx[full,test]
- python -c "import silx.test, sys; sys.exit(silx.test.run_tests());"
- pip uninstall -y PyQt5
- pip install PySide2
......@@ -184,6 +185,12 @@ manylinux1_test_cp38:
dependencies:
- manylinux1_wheels
manylinux1_test_cp39:
<<: *test_template_defintion
extends: .manylinux2014_cp39_base
dependencies:
- manylinux1_wheels
manylinux2014_test_cp36:
<<: *test_template_defintion
......@@ -203,24 +210,8 @@ manylinux2014_test_cp38:
dependencies:
- manylinux2014_wheels
.test_template_py39: &test_template_defintion_py39
stage: test
variables:
WITH_GL_TEST: "False"
script:
# No GUI, no pyopencl tests here
- pip install --pre --find-links artifacts/ --only-binary silx silx
- python -c "import silx.test, sys; sys.exit(silx.test.run_tests());"
allow_failure: true
manylinux1_test_cp39:
<<: *test_template_defintion_py39
extends: .manylinux2014_cp39_base
dependencies:
- manylinux1_wheels
manylinux2014_test_cp39:
<<: *test_template_defintion_py39
<<: *test_template_defintion
extends: .manylinux2014_cp39_base
dependencies:
- manylinux2014_wheels
......@@ -231,8 +222,8 @@ manylinux2014_test_cp39:
script:
# Pre-install numpy, h5py and fabio from silx.org
- pip install --pre --trusted-host www.silx.org --find-links http://www.silx.org/pub/wheelhouse/ --only-binary numpy,h5py,fabio numpy h5py fabio
- pip install --pre --find-links artifacts/ --only-binary numpy,h5py,fabio silx
- python -c "import silx.test, sys; sys.exit(silx.test.run_tests());"
- pip install --pre --find-links artifacts/ --only-binary numpy,h5py,fabio silx[test]
- python -c "import silx, silx.test, os, sys; path=os.path.dirname(silx.__file__); sys.exit(silx.test.run_tests(args=['--ignore=%s/app' % path, '--ignore=%s/gui' % path, '--ignore=%s/opencl' % path, '--ignore=%s/test/test_sx.py' % path]));"
manylinux2014_ppc64le_test_cp37:
<<: *test_ppc64le_template_defintion
......@@ -276,7 +267,7 @@ windows_exe:
- pip install --upgrade numpy pybind11
# Install pyopencl first to use a wheel from silx.org under Windows
- pip install --find-links http://www.silx.org/pub/wheelhouse/ --trusted-host www.silx.org --prefer-binary pyopencl
- pip install .[full]
- pip install .[full,test]
# Install pyinstaller
- pip install pyinstaller==4.1
# Generate fat binary
......@@ -317,4 +308,4 @@ windows_test_exe:
# Deploy
pages:
extends: .pages
\ No newline at end of file
extends: .pages
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