diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a4a51347d879a6174447a5ca41b4b3443e3b4868..3f4ca230641caf548b1bdad73a6b878151299ae3 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: @@ -59,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