diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 79ecf59aa7378fadee17a909116c9b32e98b6a81..f5ae9b42e3908bd480627fe0a99efface617194e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,13 +1,13 @@ # CI Config for ltaftpy / gitlab # Tests on X86_64 ubuntu -unbutu:X86_64: +ubuntu:X86_64: image: registry.gitlab.lis-lab.fr:5005/dev/ltfatpy/ubuntu:X86_64 tags: - docker script: - - pip install -e . - - nosetests + - pip install -e . --no-deps + - nosetests3 artifacts: when: always untracked: true @@ -21,7 +21,7 @@ ubuntu:i686: tags: - docker script: - - pip install -e . + - pip install -e . --no-deps - nosetests3 artifacts: when: always @@ -33,7 +33,7 @@ ubuntu:i686: # doc template .doc: &doc script: - - pip3 install -e . + - pip3 install -e . --no-deps - python3 setup.py build_sphinx - cp -r build/sphinx/html public artifacts: diff --git a/docker/Dockerfile_X86_64 b/docker/Dockerfile_X86_64 index f5deb7cbb65392c87c3b79870d98793ae584a27f..45ab6ba0ef6e3c7903dda99e134e8dd29766cf51 100644 --- a/docker/Dockerfile_X86_64 +++ b/docker/Dockerfile_X86_64 @@ -1,25 +1,33 @@ FROM ubuntu:latest MAINTAINER Denis Arrivault WORKDIR / -RUN apt-get update && apt-get install -y \ - cmake \ - libfftw3-dev \ - liblapack-dev \ - python3 \ - python3-dev \ - python3-pip \ - python3-tk \ - python3-matplotlib \ - python3-scipy \ - texlive-latex-recommended \ - texlive-latex-extra \ - dvipng -RUN pip3 install --upgrade pip -RUN pip3 install nose coverage pytest pytest-cov sphinx sphinxcontrib-bibtex +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + cmake \ + gcc \ + g++ \ + make \ + libfftw3-dev \ + liblapack-dev \ + python3 \ + python3-dev \ + python3-setuptools \ + python3-nose \ + python3-coverage \ + libjs-jquery-hotkeys \ + libjs-jquery-isonscreen \ + libjs-jquery-tablesorter \ + python3-pip \ + python3-wheel \ + python3-tk \ + python3-matplotlib \ + python3-scipy \ + texlive-latex-extra \ + dvipng \ + && \ + apt-get clean +RUN pip3 install sphinx sphinxcontrib-bibtex # Copy the ltfatpy sdist in the docker directory and uncomment the following line # if you want to include ltfatpy sources in the docker image : # ADD ../dist/ltfatpy-1.0.8.tar.gz / - -# cleanup -RUN apt-get -qy autoremove \ No newline at end of file diff --git a/docker/Dockerfile_cython_X86_64 b/docker/Dockerfile_cython_X86_64 index 65ff8dc4716c22792d6e8623d3c0ff9db885d956..3a15d4c9322710d7c16ec5846f4b387fd61318d2 100644 --- a/docker/Dockerfile_cython_X86_64 +++ b/docker/Dockerfile_cython_X86_64 @@ -1,22 +1,34 @@ FROM ubuntu:latest MAINTAINER Denis Arrivault WORKDIR / -RUN apt-get update && apt-get install -y \ - cmake \ - libfftw3-dev \ - liblapack-dev \ - python3 \ - python3-dev \ - python3-pip \ - cython \ - python3-tk \ - python3-matplotlib -RUN pip3 install --upgrade pip -RUN pip3 install scipy nose coverage pytest pytest-cov Sphinx sphinxcontrib-bibtex +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + cmake \ + gcc \ + g++ \ + make \ + libfftw3-dev \ + liblapack-dev \ + cython3 \ + python3 \ + python3-dev \ + python3-setuptools \ + python3-nose \ + python3-coverage \ + libjs-jquery-hotkeys \ + libjs-jquery-isonscreen \ + libjs-jquery-tablesorter \ + python3-pip \ + python3-wheel \ + python3-tk \ + python3-matplotlib \ + python3-scipy \ + texlive-latex-extra \ + dvipng \ + && \ + apt-get clean +RUN pip3 install sphinx sphinxcontrib-bibtex # Copy the ltfatpy sdist in the docker directory and uncomment the following line # if you want to include ltfatpy sources in the docker image : -# ADD ltfatpy-1.0.8.tar.gz / - -# cleanup -RUN apt-get -qy autoremove \ No newline at end of file +# ADD ../dist/ltfatpy-1.0.8.tar.gz / diff --git a/docker/Dockerfile_i686 b/docker/Dockerfile_i686 index 64169d01cc5fc1ff1e320ce90dcea2ed57e53c26..926b022b099514ea0b7f6de81e4bf240782785dd 100644 --- a/docker/Dockerfile_i686 +++ b/docker/Dockerfile_i686 @@ -1,22 +1,29 @@ FROM i386/ubuntu:latest MAINTAINER Denis Arrivault WORKDIR / -RUN apt-get update && apt-get install -y \ - cmake \ - libfftw3-dev \ - liblapack-dev \ - python3 \ - python3-dev \ - python3-pip \ - python3-tk \ - python3-matplotlib \ - python3-scipy -RUN pip3 install --upgrade pip -RUN pip3 install nose coverage pytest pytest-cov +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + cmake \ + gcc \ + g++ \ + make \ + libfftw3-dev \ + liblapack-dev \ + python3 \ + python3-dev \ + python3-setuptools \ + python3-nose \ + python3-coverage \ + libjs-jquery-hotkeys \ + libjs-jquery-isonscreen \ + libjs-jquery-tablesorter \ + python3-pip \ + python3-tk \ + python3-matplotlib \ + python3-scipy \ + && \ + apt-get clean # Copy the ltfatpy sdist in the docker directory and uncomment the following line # if you want to include ltfatpy sources in the docker image : # ADD ../dist/ltfatpy-1.0.8.tar.gz / - -# cleanup -RUN apt-get -qy autoremove