Merge branch 'develop' into feature/thinkpad

rowers/tests/statements.py

@@ -9,7 +9,7 @@ pytestmark = pytest.mark.django_db
 
 from bs4 import BeautifulSoup
 import re
-from nose_parameterized import parameterized
+from parameterized import parameterized
 from django.test import TestCase, Client,override_settings, RequestFactory, TransactionTestCase
 
 from django.core.management import call_command
@@ -35,13 +35,15 @@ from rowers.tasks import handle_makeplot
 from rowers.utils import serialize_list,deserialize_list
 from rowers.utils import NoTokenError
 from rowers.plannedsessions import get_dates_timeperiod
-from shutil import copyfile
+from shutil import copyfile, copy
 from nose.tools import assert_true
 from mock import Mock, patch
 from minimocktest import MockTestCase
 import pandas as pd
 import rowers.c2stuff as c2stuff
 
+from django.core.urlresolvers import reverse, reverse_lazy
+
 import json
 import numpy as np
 
@@ -112,7 +114,8 @@ def get_random_file(filename='rowers/tests/testdata/testdata.csv',name=''):
     else:
         newfilename = 'rowers/tests/testdata/temp/'+fromstring+uuid4().hex[:16]+'.'+extension
 
-    copyfile(filename,newfilename)
+    # copyfile(filename,newfilename)
+    copy(filename,newfilename)
 
     thedict = {
         'row':row,