Corrects dockerfiles

.gitignore

@@ -65,6 +65,10 @@ ltfatpy.egg-info/
 .project
 .pydevproject
 
+# PyCharm #
+###########
+.idea
+
 # Ipython files #
 #################
 
@@ -89,3 +93,4 @@ LtfatPyt.egg-info/
 .cache/
 dist/
 MANIFEST
+

.gitlab-ci.yml

@@ -2,7 +2,6 @@
 stages:
   - build
   - test
-  - dist
 
 # Global runner/docker image definition
 image: ubuntu:latest
@@ -30,29 +29,16 @@ build:
   tags:
     - docker
   script:
-    - python3 setup.py install
+    - pip3 install -e .
 
 # Tests 
 test:
   stage: test
   tags:
     - docker
+  dependencies:
+    - build
   script:
-    - python3 setup.py test
-  artifacts:
-    when: always
-    untracked: true
-    paths:
-      - build/
-    expire_in: 8d
-
-# Installation and test with pip
-dist:
-  stage: dist
-  tags:
-    - docker
-  script:
-    - pip3 install -e .
     - nosetests
   artifacts:
     when: always
@@ -60,3 +46,4 @@ dist:
     paths:
       - build/
     expire_in: 8d
+

docker/Dockerfile

@@ -10,9 +10,6 @@ RUN apt-get update && apt-get install -y \
     python3-pip \
     python3-tk
 RUN pip3 install --upgrade pip
-RUN pip3 install scipy matplotlib nose coverage Sphinx sphinxcontrib-bibtex 
-ADD ltfatpy-1.0.8.tar.gz /
-#RUN pip3 install -e ltfatpy-1.0.8/
-#WORKDIR ltfatpy-1.0.8
+RUN pip3 install scipy matplotlib nose coverage pytest pytest-cov Sphinx sphinxcontrib-bibtex
+# cleanup
+RUN apt-get -qy autoremove
\ No newline at end of file
-#RUN nosetests
-#RUN python3 setup.py build_sphinx

docker/Dockerfile_cython

-FROM debian:jessie
+FROM ubuntu:latest
 MAINTAINER Denis Arrivault
 WORKDIR /
 RUN apt-get update && apt-get install -y \
     cmake \
     libfftw3-dev \
     liblapack-dev \
-    python \
-    python-pip \
+    python3 \
+    python3-dev \
+    python3-pip \
     cython \
-    python-matplotlib \
-    gfortran
-RUN pip install scipy coverage
-ADD ltfatpy-1.0.0.tar.gz /
-RUN pip install ltfatpy-1.0.0/
+    python3-tk
+RUN pip3 install --upgrade pip
+RUN pip3 install scipy matplotlib nose coverage pytest pytest-cov Sphinx sphinxcontrib-bibtex
+# cleanup
+RUN apt-get -qy autoremove
\ No newline at end of file