From 121889dd103dc02eba185b3e93168398cfebefb8 Mon Sep 17 00:00:00 2001
From: "Phyks (Lucas Verney)" <phyks@phyks.me>
Date: Mon, 26 Jun 2017 11:43:00 +0200
Subject: [PATCH] Basic update of CI to use Python 3 as well

---
 .ci/requirements.txt |  2 ++
 .gitlab-ci.yml       | 84 ++++++++++++++++++++++++++++++--------------
 2 files changed, 59 insertions(+), 27 deletions(-)

diff --git a/.ci/requirements.txt b/.ci/requirements.txt
index 68f87ede2c..224b705e19 100644
--- a/.ci/requirements.txt
+++ b/.ci/requirements.txt
@@ -1,6 +1,8 @@
 coverage==4.2
 flake8==3.2.1
+future==0.16.0
 mock==2.0.0
 nose==1.3.7
 pyflakes==1.3.0
+six==1.10.0
 xunitparser==1.3.3
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2e385cd8ca..c084671a2e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,27 +1,57 @@
-image: "python:2.7"
-
-before_script:
-  - "pip install -r .ci/requirements.txt"
-  - "REQUIREMENTS=$(mktemp) && python setup.py requirements > ${REQUIREMENTS} && pip install -r ${REQUIREMENTS} && rm ${REQUIREMENTS}"
-  - "pip install -r .ci/requirements_modules.txt"
-
-build:
-  stage: "build"
-  script:
-    - "./tools/local_install.sh ~/bin"
-
-lint:
-  stage: "test"
-  script:
-    - "./tools/pyflakes.sh"
-    - "./tools/weboob_lint.sh"
-
-unittests:
-  stage: "test"
-  script:
-    - "./tools/run_tests.sh"
-
-doc:
-  stage: "deploy"
-  script:
-    - "cd ./docs && make html"
+test:2.7:
+  image: "python:2.7"
+
+  before_script:
+    - "pip install -r .ci/requirements.txt"
+    - "REQUIREMENTS=$(mktemp) && python setup.py requirements > ${REQUIREMENTS} && pip install -r ${REQUIREMENTS} && rm ${REQUIREMENTS}"
+    - "pip install -r .ci/requirements_modules.txt"
+
+  build:
+    stage: "build"
+    script:
+      - "./tools/local_install.sh ~/bin"
+
+  lint:
+    stage: "test"
+    script:
+      - "./tools/pyflakes.sh"
+      - "./tools/weboob_lint.sh"
+
+  unittests:
+    stage: "test"
+    script:
+      - "./tools/run_tests.sh"
+
+  doc:
+    stage: "deploy"
+    script:
+      - "cd ./docs && make html"
+
+test:3:
+  image: "python:3"
+
+  before_script:
+    - "pip install -r .ci/requirements.txt"
+    - "REQUIREMENTS=$(mktemp) && python setup.py requirements > ${REQUIREMENTS} && pip install -r ${REQUIREMENTS} && rm ${REQUIREMENTS}"
+    - "pip install -r .ci/requirements_modules.txt"
+
+  build:
+    stage: "build"
+    script:
+      - "./tools/local_install.sh ~/bin"
+
+  lint:
+    stage: "test"
+    script:
+      - "./tools/pyflakes.sh"
+      - "./tools/weboob_lint.sh"
+
+  unittests:
+    stage: "test"
+    script:
+      - "./tools/run_tests.sh -3"
+
+  doc:
+    stage: "deploy"
+    script:
+      - "cd ./docs && make html"
-- 
GitLab