From 66e17df6112eec7e15e85f7c767bce609b448dcc Mon Sep 17 00:00:00 2001
From: Denis Arrivault <denis.arrivault@lif.univ-mrs.fr>
Date: Thu, 27 Apr 2017 15:29:01 +0200
Subject: [PATCH] Up
---
MANIFEST.in | 2 +-
docker/Dockerfile | 22 ++++++++++++----------
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/MANIFEST.in b/MANIFEST.in
index 88d07c6..69147fa 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -3,7 +3,7 @@ recursive-include ltfatpy/comp *.c *.pyx
recursive-include doc *.rst *.py *.png *.bib
prune ltfat_C_kernel/tests
prune ltfat_C_kernel/lib
-prune ltfatpy/tests
+#prune ltfatpy/tests
graft cmake-modules
include *.txt
include *.rst
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 2102277..01cc733 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,16 +1,18 @@
-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-dev \
- python-pip \
- python-matplotlib \
- gfortran
-RUN pip install scipy coverage Sphinx sphinxcontrib-bibtex
-ADD ltfatpy-1.0.0.tar.gz /
-RUN pip install ltfatpy-1.0.0/ && pip uninstall ltfatpy
-RUN cd ltfatpy-1.0.0/ && python setup.py build_sphinx
+ python3 \
+ python3-dev \
+ 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 nosetests
+#RUN python3 setup.py build_sphinx
--
GitLab