Merge branch 'master' of github.com:computationalmodelling/fidimag into dmi-nn-working

Author: davidcortesortuno

Dockerfile

@@ -3,7 +3,7 @@ FROM ubuntu:16.04
 RUN apt -y update 
 RUN apt install -y git python3 python3-pip gcc psutils cmake wget make
 RUN apt install -y gfortran libblas-dev liblapack-dev python3-tk sudo fonts-lato
-RUN pip3 install cython matplotlib pytest scipy psutil pyvtk ipywidgets
+RUN pip3 install cython matplotlib pytest scipy psutil pyvtk ipywidgets -U
 RUN pip3 install --no-cache-dir notebook
 
 RUN ln -s /usr/bin/python3 /usr/bin/python

docker/travis/Dockerfile

@@ -30,7 +30,7 @@ RUN pip3 install --upgrade setuptools==20.4
 RUN pip3 install --upgrade setuptools==20.4
 # ----------
 
-RUN pip3 install ipywidgets nbval pyvtk six
+RUN pip3 install ipywidgets nbval pyvtk six pytest -U
 
 WORKDIR /fidimag
 ADD . /fidimag

tests/cuboid_mesh_test.py

@@ -1,6 +1,6 @@
 from __future__ import print_function
 import numpy as np
-from .cuboid_mesh import CuboidMesh
+from fidimag.common.cuboid_mesh import CuboidMesh
 
 
 def allclose(a, b):

tests/integrators_test.py

@@ -8,7 +8,7 @@
 import pytest
 import numpy as np
 from math import ceil
-from .integrators import euler_step, runge_kutta_step, StepIntegrator, ScipyIntegrator
+from fidimag.common.integrators import euler_step, runge_kutta_step, StepIntegrator, ScipyIntegrator
 
 
 interval = (0, 10)