Skip to content
Snippets Groups Projects
Commit c7aac82d authored by Florent Jaillet's avatar Florent Jaillet
Browse files

Modifying continuous integration configuration to use pytest

parent 358e880a
No related branches found
No related tags found
No related merge requests found
Pipeline #
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 2
− 2
View file @ c7aac82d
...@@ -7,7 +7,7 @@ ubuntu:X86_64: ...@@ -7,7 +7,7 @@ ubuntu:X86_64:
- docker - docker
script: script:
- pip3 install -e . --no-deps - pip3 install -e . --no-deps
- nosetests3 - py.test-3
artifacts: artifacts:
when: always when: always
untracked: true untracked: true
...@@ -22,7 +22,7 @@ ubuntu:i686: ...@@ -22,7 +22,7 @@ ubuntu:i686:
- docker - docker
script: script:
- pip3 install -e . --no-deps - pip3 install -e . --no-deps
- nosetests3 - py.test-3
artifacts: artifacts:
when: always when: always
untracked: true untracked: true
......
docker/Dockerfile_X86_64
+ 3
− 5
View file @ c7aac82d
...@@ -12,11 +12,8 @@ RUN apt-get update && \ ...@@ -12,11 +12,8 @@ RUN apt-get update && \
python3 \ python3 \
python3-dev \ python3-dev \
python3-setuptools \ python3-setuptools \
python3-nose \ python3-pytest \
python3-coverage \ python3-pytest-cov \
libjs-jquery-hotkeys \
libjs-jquery-isonscreen \
libjs-jquery-tablesorter \
python3-pip \ python3-pip \
python3-wheel \ python3-wheel \
python3-tk \ python3-tk \
...@@ -26,6 +23,7 @@ RUN apt-get update && \ ...@@ -26,6 +23,7 @@ RUN apt-get update && \
dvipng \ dvipng \
&& \ && \
apt-get clean apt-get clean
RUN pip3 install --no-deps pytest-randomly
RUN pip3 install sphinx sphinxcontrib-bibtex RUN pip3 install sphinx sphinxcontrib-bibtex
# Copy the ltfatpy sdist in the docker directory and uncomment the following line # Copy the ltfatpy sdist in the docker directory and uncomment the following line
......
docker/Dockerfile_cython_X86_64
+ 3
− 5
View file @ c7aac82d
...@@ -13,11 +13,8 @@ RUN apt-get update && \ ...@@ -13,11 +13,8 @@ RUN apt-get update && \
python3 \ python3 \
python3-dev \ python3-dev \
python3-setuptools \ python3-setuptools \
python3-nose \ python3-pytest \
python3-coverage \ python3-pytest-cov \
libjs-jquery-hotkeys \
libjs-jquery-isonscreen \
libjs-jquery-tablesorter \
python3-pip \ python3-pip \
python3-wheel \ python3-wheel \
python3-tk \ python3-tk \
...@@ -27,6 +24,7 @@ RUN apt-get update && \ ...@@ -27,6 +24,7 @@ RUN apt-get update && \
dvipng \ dvipng \
&& \ && \
apt-get clean apt-get clean
RUN pip3 install --no-deps pytest-randomly
RUN pip3 install sphinx sphinxcontrib-bibtex RUN pip3 install sphinx sphinxcontrib-bibtex
# Copy the ltfatpy sdist in the docker directory and uncomment the following line # Copy the ltfatpy sdist in the docker directory and uncomment the following line
......
docker/Dockerfile_i686
+ 4
− 5
View file @ c7aac82d
...@@ -12,17 +12,16 @@ RUN apt-get update && \ ...@@ -12,17 +12,16 @@ RUN apt-get update && \
python3 \ python3 \
python3-dev \ python3-dev \
python3-setuptools \ python3-setuptools \
python3-nose \ python3-pytest \
python3-coverage \ python3-pytest-cov \
libjs-jquery-hotkeys \
libjs-jquery-isonscreen \
libjs-jquery-tablesorter \
python3-pip \ python3-pip \
python3-wheel \
python3-tk \ python3-tk \
python3-matplotlib \ python3-matplotlib \
python3-scipy \ python3-scipy \
&& \ && \
apt-get clean apt-get clean
RUN pip3 install --no-deps pytest-randomly
# Copy the ltfatpy sdist in the docker directory and uncomment the following line # Copy the ltfatpy sdist in the docker directory and uncomment the following line
# if you want to include ltfatpy sources in the docker image : # if you want to include ltfatpy sources in the docker image :
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment