From c7aac82da9fc43f78fec296c0b0de64675bef9b3 Mon Sep 17 00:00:00 2001
From: Florent Jaillet <florent.jaillet@lis-lab.fr>
Date: Mon, 16 Apr 2018 13:27:42 +0200
Subject: [PATCH] Modifying continuous integration configuration to use pytest
---
.gitlab-ci.yml | 4 ++--
docker/Dockerfile_X86_64 | 8 +++-----
docker/Dockerfile_cython_X86_64 | 8 +++-----
docker/Dockerfile_i686 | 9 ++++-----
4 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 11a11da..8545027 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ ubuntu:X86_64:
- docker
script:
- pip3 install -e . --no-deps
- - nosetests3
+ - py.test-3
artifacts:
when: always
untracked: true
@@ -22,7 +22,7 @@ ubuntu:i686:
- docker
script:
- pip3 install -e . --no-deps
- - nosetests3
+ - py.test-3
artifacts:
when: always
untracked: true
diff --git a/docker/Dockerfile_X86_64 b/docker/Dockerfile_X86_64
index 45ab6ba..167d4fd 100644
--- a/docker/Dockerfile_X86_64
+++ b/docker/Dockerfile_X86_64
@@ -12,11 +12,8 @@ RUN apt-get update && \
python3 \
python3-dev \
python3-setuptools \
- python3-nose \
- python3-coverage \
- libjs-jquery-hotkeys \
- libjs-jquery-isonscreen \
- libjs-jquery-tablesorter \
+ python3-pytest \
+ python3-pytest-cov \
python3-pip \
python3-wheel \
python3-tk \
@@ -26,6 +23,7 @@ RUN apt-get update && \
dvipng \
&& \
apt-get clean
+RUN pip3 install --no-deps pytest-randomly
RUN pip3 install sphinx sphinxcontrib-bibtex
# Copy the ltfatpy sdist in the docker directory and uncomment the following line
diff --git a/docker/Dockerfile_cython_X86_64 b/docker/Dockerfile_cython_X86_64
index 3a15d4c..14e73de 100644
--- a/docker/Dockerfile_cython_X86_64
+++ b/docker/Dockerfile_cython_X86_64
@@ -13,11 +13,8 @@ RUN apt-get update && \
python3 \
python3-dev \
python3-setuptools \
- python3-nose \
- python3-coverage \
- libjs-jquery-hotkeys \
- libjs-jquery-isonscreen \
- libjs-jquery-tablesorter \
+ python3-pytest \
+ python3-pytest-cov \
python3-pip \
python3-wheel \
python3-tk \
@@ -27,6 +24,7 @@ RUN apt-get update && \
dvipng \
&& \
apt-get clean
+RUN pip3 install --no-deps pytest-randomly
RUN pip3 install sphinx sphinxcontrib-bibtex
# Copy the ltfatpy sdist in the docker directory and uncomment the following line
diff --git a/docker/Dockerfile_i686 b/docker/Dockerfile_i686
index 926b022..7c1aa41 100644
--- a/docker/Dockerfile_i686
+++ b/docker/Dockerfile_i686
@@ -12,17 +12,16 @@ RUN apt-get update && \
python3 \
python3-dev \
python3-setuptools \
- python3-nose \
- python3-coverage \
- libjs-jquery-hotkeys \
- libjs-jquery-isonscreen \
- libjs-jquery-tablesorter \
+ python3-pytest \
+ python3-pytest-cov \
python3-pip \
+ python3-wheel \
python3-tk \
python3-matplotlib \
python3-scipy \
&& \
apt-get clean
+RUN pip3 install --no-deps pytest-randomly
# Copy the ltfatpy sdist in the docker directory and uncomment the following line
# if you want to include ltfatpy sources in the docker image :
--
GitLab