From 18dd5816c957f8e90800b3cf9d08a0dcace28de5 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauld.mccarthy@gmail.com>
Date: Wed, 10 May 2017 15:43:07 +0100
Subject: [PATCH] Does CI finally work?
---
.gitlab-ci.yml | 22 ++++++++++------------
requirements.txt | 2 +-
setup.py | 6 +++---
3 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 94b90a111..65e4aab19 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,14 +1,12 @@
-# Keeping this commented out until CI is working
-#
-# test:2.7:
-# image: python2.7
-# script:
-# - cat requirements.txt | xargs -n 1 pip install
-# - python setup.py test
+test:2.7:
+ image: wxpython-python2.7:4.0.0a2
+ script:
+ - cat requirements.txt | xargs -n 1 pip install
+ - xvfb-run python setup.py test
-# test:3.5:
-# image: python3.5
-# script:
-# - cat requirements.txt | xargs -n 1 pip install
-# - python setup.py test
+test:3.5:
+ image: wxpython-python3.6:4.0.0a2
+ script:
+ - cat requirements.txt | xargs -n 1 pip install
+ - xvfb-run python setup.py test
diff --git a/requirements.txt b/requirements.txt
index 83de75e26..dd852d16e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,4 +2,4 @@ six>=1.10.0,<2.0
numpy>=1.11.1,<2.0
nibabel>=2.1,<3.0
indexed_gzip>=0.3.3,<0.4
-wxPython>=3.0.2.0,<=4.0
+wxPython>=3.0.2.0,<=4.0.0a2
diff --git a/setup.py b/setup.py
index c793739fa..459dc01e1 100644
--- a/setup.py
+++ b/setup.py
@@ -102,11 +102,11 @@ setup(
install_requires=install_requires,
setup_requires=['pytest-runner'],
- tests_require=['pytest',
- 'mock',
+ tests_require=['mock',
'pytest-cov',
'pytest-html',
- 'pytest-runner'],
+ 'pytest-runner',
+ 'pytest'],
test_suite='tests',
cmdclass={'doc' : doc},
--
GitLab