summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradityacp2021-03-25 09:41:00 +0530
committeradityacp2021-03-25 11:51:17 +0530
commitfd40959d274b7d555f17110b29044d2ce0e0eaf2 (patch)
tree7bbe043c25746276eadc5bca9a4c43ada69a0e60
parent9cf0dd7abed0db01a676f731f69c3c63026bc2a3 (diff)
downloadonline_test-fd40959d274b7d555f17110b29044d2ce0e0eaf2.tar.gz
online_test-fd40959d274b7d555f17110b29044d2ce0e0eaf2.tar.bz2
online_test-fd40959d274b7d555f17110b29044d2ce0e0eaf2.zip
Bump django from 3.0.7 to 3.1.7
-rw-r--r--requirements/requirements-common.txt4
-rw-r--r--setup.py2
-rw-r--r--yaksh/test_models.py4
-rw-r--r--yaksh/test_views.py2
4 files changed, 6 insertions, 6 deletions
diff --git a/requirements/requirements-common.txt b/requirements/requirements-common.txt
index f9f7a95..1677ca4 100644
--- a/requirements/requirements-common.txt
+++ b/requirements/requirements-common.txt
@@ -1,6 +1,6 @@
-r requirements-codeserver.txt
invoke==0.21.0
-django==3.0.7
+django==3.1.7
django-taggit==1.2.0
pytz==2019.3
requests-oauthlib>=0.6.1
@@ -16,7 +16,7 @@ redis==3.4.1
notifications-plugin==0.1.2
django-celery-beat==2.0.0
django-celery-results==1.2.1
-djangorestframework==3.11.0
+djangorestframework==3.11.2
django-cors-headers==3.1.0
Pillow
pandas
diff --git a/setup.py b/setup.py
index f63f364..ea742f6 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ def get_version():
install_requires = [
- 'django==3.0.7',
+ 'django==3.1.7',
'django-taggit==1.2.0',
'pytz==2019.3',
'requests-oauthlib>=0.6.1',
diff --git a/yaksh/test_models.py b/yaksh/test_models.py
index c805c52..019e2fc 100644
--- a/yaksh/test_models.py
+++ b/yaksh/test_models.py
@@ -2611,14 +2611,14 @@ class QRcodeTestCase(unittest.TestCase):
def test_generate_image(self):
# Given
qrcode = self.qrcode
- image_name = 'qrcode/{0}.png'.format(qrcode.short_key)
+ image_name = qrcode.short_key
# When
qrcode.generate_image('test')
# Then
self.assertTrue(qrcode.is_active())
- self.assertEqual(qrcode.image.name, image_name)
+ self.assertIn(image_name, qrcode.image.name)
def test_get_qrcode(self):
# Given
diff --git a/yaksh/test_views.py b/yaksh/test_views.py
index 925c3d1..793f9c8 100644
--- a/yaksh/test_views.py
+++ b/yaksh/test_views.py
@@ -4352,7 +4352,7 @@ class TestSelfEnroll(TestCase):
-class TestGrader(SimpleTestCase):
+class TestGrader(TestCase):
allow_database_queries = True
def setUp(self):