diff --git a/.travis.yml b/.travis.yml index aa393b9..cc7748e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,12 @@ language: python python: - - "2.7" + - "3.5" install: - - pip install -r dockerfiles/oj_web_server/requirements.txt - - mkdir log test_case upload - - cp oj/custom_settings.example.py oj/custom_settings.py - - echo "SECRET_KEY=\"`cat /dev/urandom | head -1 | md5sum | head -c 32`\"" >> oj/custom_settings.py - - python manage.py migrate - - python manage.py migrate --database=submission - - python manage.py initadmin + - pip install -r deploy/requirements.txt + - mkdir log test_case upload + - cp oj/custom_settings.example.py oj/custom_settings.py + - echo "SECRET_KEY=\"`cat /dev/urandom | head -1 | md5sum | head -c 32`\"" >> oj/custom_settings.py + - python manage.py migrate + - python manage.py initadmin script: - - python manage.py test \ No newline at end of file + - python manage.py test diff --git a/account/tests.py b/account/tests.py index fd07356..f8fcd17 100644 --- a/account/tests.py +++ b/account/tests.py @@ -4,7 +4,7 @@ from unittest import mock from django.contrib import auth from django.utils.translation import ugettext as _ -from utils.otp_auth import OtpAuth +from otpauth import OtpAuth from utils.shortcuts import rand_str from utils.api.tests import APITestCase, APIClient