Merge branch 'master' of https://git.fmrib.ox.ac.uk/shahdloo/pymapvbvd into dev

# Conflicts:
#	requirements.txt

.gitlab-ci.yml

+# This file is a template, and might need editing before it works on your project.
+# Official language image. Look for the different tagged releases at:
+# https://hub.docker.com/r/library/python/tags/
+image: python:latest
+
+# Change pip's cache directory to be inside the project directory since we can
+# only cache local items.
+variables:
+  PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
+
+# Pip's cache doesn't store the python packages
+# https://pip.pypa.io/en/stable/reference/pip_install/#caching
+#
+# If you want to also cache the installed packages, you have to install
+# them in a virtualenv and cache it as well.
+cache:
+  paths:
+    - .cache/pip
+    - venv/
+
+before_script:
+  - python -V  # Print out python version for debugging
+  - pip install virtualenv
+  - virtualenv venv
+  - source venv/bin/activate
+  - pip install -r requirements.txt
+
+# different stages in the pipeline
+stages:
+  - Test
+
+pytest:
+  stage: Test
+  script:
+  - cd test/;pytest -v
\ No newline at end of file

requirements.txt

@@ -5,4 +5,5 @@ tqdm~=4.45.0
 dataclasses~=0.7
 scipy~=1.4.1
 matplotlib~=3.2.1
-setuptools~=46.1.3
\ No newline at end of file
+setuptools~=46.1.3
+pytest==5.3.5