From cb2a222bf0ff1de99000825006b0598be387316d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Wed, 13 Feb 2019 17:56:18 +0100 Subject: [PATCH 1/2] [CI] Be generic with respect to specific Py3 version --- .gitlab-ci.yml | 33 +++------------------------------ 1 file changed, 3 insertions(+), 30 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a4a5134..f0ac1eb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,17 +1,3 @@ -Python 2.6: - script: - - py_version=2.6 - - export EXTRA_INSTALL="numpy" - - 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: - - python2.6 - except: - - tags - artifacts: - reports: - junit: test/pytest.xml - Python 2.7: script: - py_version=2.7 @@ -26,28 +12,15 @@ Python 2.7: reports: junit: test/pytest.xml -Python 3.5: - script: - - py_version=3.5 - - export EXTRA_INSTALL="numpy" - - 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.5 - except: - - tags - artifacts: - reports: - junit: test/pytest.xml -Python 3.7: +Python 3: script: - - py_version=3.7 + - py_version=3 - export EXTRA_INSTALL="numpy" - 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 except: - tags artifacts: -- GitLab From 9102518faf6ff8644f4bee7f7cf87d7750744096 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Thu, 14 Feb 2019 04:30:54 +0100 Subject: [PATCH 2/2] [CI] Run flake8 py3-generic --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f0ac1eb..3f4ca23 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,6 +32,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 pytools test" tags: - - python3.5 + - python3 except: - tags -- GitLab