summaryrefslogtreecommitdiff
path: root/requirements
diff options
context:
space:
mode:
authorPalaparthy Adityachandra2020-05-13 16:32:29 +0530
committerGitHub2020-05-13 16:32:29 +0530
commit61d4096697a84873473ad28afb0dc79f211a54b3 (patch)
tree117068fb9a2ddef2a3a2dc81567ff07a3069f0bf /requirements
parent31e8b94b8ebf74d77cc8596411c6acfa2112f949 (diff)
parentb264b673a2f84def1b9736a7a596b1acd5bb4d72 (diff)
downloadonline_test-61d4096697a84873473ad28afb0dc79f211a54b3.tar.gz
online_test-61d4096697a84873473ad28afb0dc79f211a54b3.tar.bz2
online_test-61d4096697a84873473ad28afb0dc79f211a54b3.zip
Merge branch 'master' into change-create_question
Diffstat (limited to 'requirements')
-rw-r--r--requirements/requirements-common.txt6
-rw-r--r--requirements/requirements-production.txt (renamed from requirements/requirements-py3.txt)0
-rw-r--r--requirements/requirements-py2.txt2
3 files changed, 4 insertions, 4 deletions
diff --git a/requirements/requirements-common.txt b/requirements/requirements-common.txt
index 80dadb3..ca0ea4f 100644
--- a/requirements/requirements-common.txt
+++ b/requirements/requirements-common.txt
@@ -7,7 +7,9 @@ requests-oauthlib>=0.6.1
social-auth-app-django==3.1.0
selenium==2.53.6
coverage
-ruamel.yaml==0.15.23
+ruamel.yaml==0.16.10
markdown==2.6.9
pygments==2.2.0
-Pillow \ No newline at end of file
+djangorestframework==3.11.0
+django-cors-headers==3.1.0
+Pillow
diff --git a/requirements/requirements-py3.txt b/requirements/requirements-production.txt
index 3d13335..3d13335 100644
--- a/requirements/requirements-py3.txt
+++ b/requirements/requirements-production.txt
diff --git a/requirements/requirements-py2.txt b/requirements/requirements-py2.txt
deleted file mode 100644
index 38777a1..0000000
--- a/requirements/requirements-py2.txt
+++ /dev/null
@@ -1,2 +0,0 @@
--r requirements-common.txt
-mysql-python==1.2.5