diff options
| author | ankitjavalkar | 2016-06-10 16:53:17 +0530 |
|---|---|---|
| committer | ankitjavalkar | 2016-07-08 12:36:46 +0530 |
| commit | 5e54ec5bbdcb79224d29226cfbbf852e3c3d7339 (patch) | |
| tree | 2c231f165f184460d294acaf4eca3eda720d0ee8 | |
| parent | 4cd9882c2e0e294b86e447e769bea6f66f69ff28 (diff) | |
| download | online_test-5e54ec5bbdcb79224d29226cfbbf852e3c3d7339.tar.gz online_test-5e54ec5bbdcb79224d29226cfbbf852e3c3d7339.tar.bz2 online_test-5e54ec5bbdcb79224d29226cfbbf852e3c3d7339.zip | |
Fix Django versions in travis.yml and minor test errors
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | online_test/urls.py | 2 | ||||
| -rw-r--r-- | yaksh/models.py | 2 | ||||
| -rw-r--r-- | yaksh/urls.py | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 6a4c8cf..508336d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,8 @@ python: - "2.7" env: - - DJANGO=1.6.4 - - DJANGO=1.9 + - DJANGO=1.8.13 + - DJANGO=1.9.5 # command to install dependencies install: diff --git a/online_test/urls.py b/online_test/urls.py index 9c55574..4d8c042 100644 --- a/online_test/urls.py +++ b/online_test/urls.py @@ -9,5 +9,5 @@ urlpatterns = [ # url(r'^blog/', include('blog.urls')), url(r'^admin/', include(admin.site.urls)), - url(r'^exam/', include('yaksh.urls')), + url(r'^exam/', include('yaksh.urls', namespace='yaksh', app_name='yaksh')), ] diff --git a/yaksh/models.py b/yaksh/models.py index ba092b8..c48eef1 100644 --- a/yaksh/models.py +++ b/yaksh/models.py @@ -42,7 +42,7 @@ test_case_types = ( attempts = [(i, i) for i in range(1, 6)] attempts.append((-1, 'Infinite')) -days_between_attempts = ((j, j) for j in range(401)) +days_between_attempts = [(j, j) for j in range(401)] test_status = ( ('inprogress', 'Inprogress'), diff --git a/yaksh/urls.py b/yaksh/urls.py index fa1713c..7a41f95 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -4,7 +4,7 @@ from django.contrib.auth.views import password_reset, password_reset_confirm,\ password_reset_done, password_reset_complete, password_change,\ password_change_done -app_name = 'yaksh' +# app_name = 'yaksh' urlpatterns = [ url(r'^forgotpassword/$', password_reset, name="password_reset"), url(r'^password_reset/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$', |