summaryrefslogtreecommitdiff
path: root/requirements
diff options
context:
space:
mode:
authorPalaparthy Adityachandra2020-05-13 16:24:52 +0530
committerGitHub2020-05-13 16:24:52 +0530
commitf7825eade425cb51ba053763db9d9fd051b0f4ce (patch)
treebc15b6cf7b5bbab4d4c8cfac5dd43abaaf778777 /requirements
parentb8636965de8a86e68fd542754678e6826c7e5eac (diff)
parent833b96ac49499810934ada8ba02750623455d0cd (diff)
downloadonline_test-f7825eade425cb51ba053763db9d9fd051b0f4ce.tar.gz
online_test-f7825eade425cb51ba053763db9d9fd051b0f4ce.tar.bz2
online_test-f7825eade425cb51ba053763db9d9fd051b0f4ce.zip
Merge branch 'master' into merge_monitor_regrade
Diffstat (limited to 'requirements')
-rw-r--r--requirements/requirements-common.txt4
-rw-r--r--requirements/requirements-production.txt (renamed from requirements/requirements-py3.txt)0
-rw-r--r--requirements/requirements-py2.txt2
3 files changed, 3 insertions, 3 deletions
diff --git a/requirements/requirements-common.txt b/requirements/requirements-common.txt
index aae82f3..db5de43 100644
--- a/requirements/requirements-common.txt
+++ b/requirements/requirements-common.txt
@@ -7,7 +7,7 @@ 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
celery==4.4.2
@@ -15,4 +15,6 @@ 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
+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