From 6fb9f74ee9d2de9a8fb6714907da52a3ed870431 Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Wed, 8 Nov 2017 16:03:10 +0530
Subject: - Add pytest as a requirement to the requirements file - Modify image
 name in tasks.py

---
 Dockerfile                               | 2 +-
 requirements/requirements-codeserver.txt | 1 +
 tasks.py                                 | 2 +-
 yaksh/models.py                          | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f9d4b5f..6a7d894 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,4 +8,4 @@ echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | de
 add-apt-repository -y ppa:webupd8team/java && \
 apt-get update && \
 apt-get install -y oracle-java8-installer && \
-apt-get install -y sudo software-properties-common python net-tools git python3-pip vim libmysqlclient-dev scilab build-essential
+apt-get install -y sudo python net-tools git python3-pip vim libmysqlclient-dev scilab build-essential python3-numpy python3-scipy ipython3 ipython3-notebook python3-pandas python3-nose
diff --git a/requirements/requirements-codeserver.txt b/requirements/requirements-codeserver.txt
index e44f592..a4f419c 100644
--- a/requirements/requirements-codeserver.txt
+++ b/requirements/requirements-codeserver.txt
@@ -1,3 +1,4 @@
+pytest
 six
 requests
 tornado
diff --git a/tasks.py b/tasks.py
index 66ea233..11a207a 100644
--- a/tasks.py
+++ b/tasks.py
@@ -5,7 +5,7 @@ from yaksh.settings import SERVER_POOL_PORT
 
 SCRIPT_DIR = os.path.abspath(os.path.dirname(__file__))
 TARGET_CONTAINER_NAME = 'yaksh_code_server'
-SRC_IMAGE_NAME = 'yaksh_code_server_image'
+SRC_IMAGE_NAME = 'fossee/yaksh_codeserver'
 
 def create_dir(path):
     if not os.path.exists(path):
diff --git a/yaksh/models.py b/yaksh/models.py
index 4b5d553..d698232 100644
--- a/yaksh/models.py
+++ b/yaksh/models.py
@@ -82,7 +82,7 @@ test_status = (
                 ('completed', 'Completed'),
               )
 
-FIXTURES_DIR_PATH = os.path.join(settings.BASE_DIR, 'yaksh/fixtures/')
+FIXTURES_DIR_PATH = os.path.join(settings.BASE_DIR, 'yaksh', 'fixtures')
 
 
 def get_assignment_dir(instance, filename):
-- 
cgit