From 06c6516a6eb5f51b07b54ef0d9b331b38da36f0e Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Tue, 24 Oct 2017 15:36:28 +0100
Subject: [PATCH] style stage needs stuff to be installed. Hoping that the
"exit 0" doesn'tt break anything
---
.gitlab-ci.yml | 30 ++++++++++++++++++++----------
1 file changed, 20 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7670578b7..6fb21ce9c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -210,7 +210,6 @@ variables:
.test: &test_template
- stage: test
<<: *setup_ssh
# Releases are just tags on a release
@@ -257,6 +256,14 @@ variables:
- pip install sphinx sphinx-rtd-theme
- pip install pytest pytest-cov pytest-html pytest-runner mock coverage
+ # style test
+ - if [ "$TEST_STYLE"x != "x" ]; then
+ pip install pylint flake8;
+ flake8 fsl || true;
+ pylint --output-format=colorized fsl || true;
+ exit 0;
+ fi
+
# We need the FSL atlases for the atlas
# tests, and need $FSLDIR to be defined
- export FSLDIR=/fsl/
@@ -287,6 +294,7 @@ variables:
test:2.7:
+ stage: test
image: ubuntu:16.04
<<: *test_template
variables:
@@ -299,6 +307,7 @@ test:2.7:
# we use ubuntu:14.04 for python 3.4, because
# wxpython is not available for 16.04/3.4
test:3.4:
+ stage: test
image: ubuntu:14.04
<<: *test_template
variables:
@@ -309,6 +318,7 @@ test:3.4:
test:3.5:
+ stage: test
image: ubuntu:16.04
<<: *test_template
variables:
@@ -319,6 +329,7 @@ test:3.5:
test:3.6:
+ stage: test
image: ubuntu:16.04
<<: *test_template
variables:
@@ -335,16 +346,15 @@ test:3.6:
style:
stage: style
+ image: ubuntu:14.04
+ <<: *test_template
+ variables:
+ PY_VERSION: "python3.5"
+ PY_PACKAGES: "python3-pip python3-venv"
+ PY_VENV: "python3.5 -m venv"
+ INSTALL_WX: "pip install --only-binary wxpython -f $WXPYTHON_UBUNTU1404_URL wxpython"
+ TEST_STYLE: "true"
- tags:
- - docker
-
- image: python:3.5
-
- script:
- - pip install flake8 pylint
- - flake8 fsl || true
- - pylint --output-format=colorized fsl || true
###########
--
GitLab