Remove python 2, change manylinux 2010 to 2014, remove Qt tests (failing) on Windows

.gitlab-ci.yml

@@ -12,7 +12,7 @@ stages:
 variables:
   PROJECT: silx
   REPOSITORY: https://github.com/silx-kit/silx
-  MANYLINUX_PYTHON_VER: cp27-cp27m cp27-cp27mu cp35-cp35m cp36-cp36m cp37-cp37m cp38-cp38
+  MANYLINUX_PYTHON_VER: cp35-cp35m cp36-cp36m cp37-cp37m cp38-cp38
   SILX_OPENCL: "False"
   EXTRA_SETUP_PY_CMD_OPTIONS: "build --no-openmp"
 
@@ -24,13 +24,10 @@ source:
 manylinux1_wheels:
   extends: .manylinux1_wheels
 
-manylinux2010_wheels:
-  extends: .manylinux2010_wheels
+manylinux2014_wheels:
+  extends: .manylinux2014_wheels
 
 
-windows_wheel_python27:
-  extends: .windows_wheel_python27
-
 windows_wheel_python36:
   extends: .windows_wheel_python36
 
@@ -49,9 +46,6 @@ debian10:
   extends: .debian10
 
 
-macos_wheel_python27:
-  extends: .macos_wheel_python27
-
 macos_wheel_python35:
   extends: .macos_wheel_python35
 
@@ -67,10 +61,10 @@ macos_wheel_python38:
 
 # Test
 
-.test_template: &test_template_defintion
+.test_noqt_template: &test_noqt_template_defintion
   stage: test
   variables:
-    WITH_GL_TEST: "False"
+    WITH_QT_TEST: "False"
   script:
     # Install pyopencl build dependencies first
     - pip install numpy pybind11
@@ -78,70 +72,67 @@ macos_wheel_python38:
     - 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]
     - python -c "import silx.test, sys; sys.exit(silx.test.run_tests());"
-    - pip uninstall -y PyQt5
-    - pip install PySide2
-    - python -c "import silx.test, sys; sys.exit(silx.test.run_tests());"
 
 
 windows_test_python36:
-  <<: *test_template_defintion
+  <<: *test_noqt_template_defintion
   extends: .windows_base_python36
   dependencies:
     - windows_wheel_python36
-  allow_failure: true
 
 windows_test_python37:
-  <<: *test_template_defintion
+  <<: *test_noqt_template_defintion
   extends: .windows_base_python37
   dependencies:
     - windows_wheel_python37
-  allow_failure: true
 
 windows_test_python38:
-  <<: *test_template_defintion
+  <<: *test_noqt_template_defintion
   extends: .windows_base_python38
   dependencies:
     - windows_wheel_python38
-  allow_failure: true
 
 
 macos_test_python35:
-  <<: *test_template_defintion
-  extends: .macos_base
+  <<: *test_noqt_template_defintion
+  extends: .macos_base_python35
   dependencies:
     - macos_wheel_python35
-  variables:
-    PYTHON_VER: "3.5"
-    WITH_QT_TEST: "False"
 
 macos_test_python36:
-  <<: *test_template_defintion
-  extends: .macos_base
+  <<: *test_noqt_template_defintion
+  extends: .macos_base_python36
   dependencies:
     - macos_wheel_python36
-  variables:
-    PYTHON_VER: "3.6"
-    WITH_QT_TEST: "False"
 
 macos_test_python37:
-  <<: *test_template_defintion
-  extends: .macos_base
+  <<: *test_noqt_template_defintion
+  extends: .macos_base_python37
   dependencies:
     - macos_wheel_python37
-  variables:
-    PYTHON_VER: "3.7"
-    WITH_QT_TEST: "False"
 
 macos_test_python38:
-  <<: *test_template_defintion
-  extends: .macos_base
+  <<: *test_noqt_template_defintion
+  extends: .macos_base_python38
   dependencies:
     - macos_wheel_python38
-  variables:
-    PYTHON_VER: "3.8"
-    WITH_QT_TEST: "False"
 
 
+.test_template: &test_template_defintion
+  stage: test
+  variables:
+    WITH_GL_TEST: "False"
+  script:
+    # Install pyopencl build dependencies first
+    - 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]
+    - python -c "import silx.test, sys; sys.exit(silx.test.run_tests());"
+    - pip uninstall -y PyQt5
+    - pip install PySide2
+    - python -c "import silx.test, sys; sys.exit(silx.test.run_tests());"
+
 manylinux1_test_cp35:
   <<: *test_template_defintion
   extends: .manylinux2014_cp35_base
@@ -167,29 +158,29 @@ manylinux1_test_cp38:
     - manylinux1_wheels
 
 
-manylinux2010_test_cp35:
+manylinux2014_test_cp35:
   <<: *test_template_defintion
   extends: .manylinux2014_cp35_base
   dependencies:
-    - manylinux2010_wheels
+    - manylinux2014_wheels
 
-manylinux2010_test_cp36:
+manylinux2014_test_cp36:
   <<: *test_template_defintion
   extends: .manylinux2014_cp36_base
   dependencies:
-    - manylinux2010_wheels
+    - manylinux2014_wheels
 
-manylinux2010_test_cp37:
+manylinux2014_test_cp37:
   <<: *test_template_defintion
   extends: .manylinux2014_cp37_base
   dependencies:
-    - manylinux2010_wheels
+    - manylinux2014_wheels
 
-manylinux2010_test_cp38:
+manylinux2014_test_cp38:
   <<: *test_template_defintion
   extends: .manylinux2014_cp38_base
   dependencies:
-    - manylinux2010_wheels
+    - manylinux2014_wheels
 
 
 # Deploy