From 1b1b5c5445c66ae74ba6308004c386f98dbd9a66 Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Thu, 31 Jan 2019 12:23:33 -0600 Subject: [PATCH 1/2] Remove python3.5 tags --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5e60636..5fbed5d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -86,7 +86,7 @@ Documentation: - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-docs.sh - ". ./build-docs.sh" tags: - - python3.5 + - python3 only: - master @@ -95,6 +95,6 @@ Flake8: - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-flake8.sh - ". ./prepare-and-run-flake8.sh boxtree test" tags: - - python3.5 + - python3 except: - tags -- GitLab From bc24c0a770ad290d19318b832e05171fc35f37f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Thu, 31 Jan 2019 22:39:47 +0100 Subject: [PATCH 2/2] Remove all concrete Py3 version numbers --- .gitlab-ci.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5fbed5d..07f34b4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,15 +14,15 @@ Python 2.7 POCL: reports: junit: test/pytest.xml -Python 3.7 Titan V: +Python 3 Titan V: script: - - py_version=3.7 + - export PY_EXE=python3 - export PYOPENCL_TEST=nvi:titan - EXTRA_INSTALL="pybind11 numpy mako" - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh - ". ./build-and-test-py-project.sh" tags: - - python3.7 + - python3 - nvidia-titan-v allow_failure: true except: @@ -31,15 +31,15 @@ Python 3.7 Titan V: reports: junit: test/pytest.xml -#Python 3.6 Titan X: +#Python 3 Titan X: # script: -# - py_version=3.6 +# - export PY_EXE=python3 # - export PYOPENCL_TEST=nvi:titan # - EXTRA_INSTALL="pybind11 numpy mako" # - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh # - ". ./build-and-test-py-project.sh" # tags: -# - python3.6 +# - python3 # - nvidia-titan-x # except: # - tags @@ -47,16 +47,16 @@ Python 3.7 Titan V: # reports: # junit: test/pytest.xml -Python 3.6 K40: +Python 3 K40: script: - - export PY_EXE=python3.6 + - export PY_EXE=python3 - export PYOPENCL_TEST=nvi:k40 - export EXTRA_INSTALL="pybind11 numpy mako" - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh - ". ./build-and-test-py-project.sh" allow_failure: true tags: - - python3.6 + - python3 - nvidia-k40 except: - tags @@ -64,15 +64,15 @@ Python 3.6 K40: reports: junit: test/pytest.xml -Python 3.6 POCL: +Python 3 POCL: script: - - export PY_EXE=python3.6 + - export PY_EXE=python3 - export PYOPENCL_TEST=portable - export EXTRA_INSTALL="pybind11 numpy mako" - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh - ". ./build-and-test-py-project.sh" tags: - - python3.6 + - python3 - pocl except: - tags -- GitLab