diff options
| author | prathamesh | 2016-10-04 17:22:20 +0530 |
|---|---|---|
| committer | prathamesh | 2016-10-04 17:22:20 +0530 |
| commit | 9c14e2b2026074234d9c977ca17b0c96b0789f6b (patch) | |
| tree | 8b6c8e2438563e56631c2adf986e7cb16c33afb4 /requirements | |
| parent | c5ae3d4589a71c3f3b9f622c7b67a04277269cde (diff) | |
| parent | 91dd42214ba5ad88c5158b50a7746caa3841a883 (diff) | |
| download | online_test-9c14e2b2026074234d9c977ca17b0c96b0789f6b.tar.gz online_test-9c14e2b2026074234d9c977ca17b0c96b0789f6b.tar.bz2 online_test-9c14e2b2026074234d9c977ca17b0c96b0789f6b.zip | |
Merge branch 'master' of https://github.com/FOSSEE/online_test into edit_questionpaper
Resolved
Conflicts:
yaksh/views.py
Diffstat (limited to 'requirements')
| -rw-r--r-- | requirements/requirements-common.txt | 6 | ||||
| -rw-r--r-- | requirements/requirements-py2.txt | 2 | ||||
| -rw-r--r-- | requirements/requirements-py3.txt | 2 |
3 files changed, 10 insertions, 0 deletions
diff --git a/requirements/requirements-common.txt b/requirements/requirements-common.txt new file mode 100644 index 0000000..8138a4f --- /dev/null +++ b/requirements/requirements-common.txt @@ -0,0 +1,6 @@ +django==1.9.5 +django-taggit==0.18.1 +pytz==2016.4 +python-social-auth==0.2.19 +tornado +selenium diff --git a/requirements/requirements-py2.txt b/requirements/requirements-py2.txt new file mode 100644 index 0000000..38777a1 --- /dev/null +++ b/requirements/requirements-py2.txt @@ -0,0 +1,2 @@ +-r requirements-common.txt +mysql-python==1.2.5 diff --git a/requirements/requirements-py3.txt b/requirements/requirements-py3.txt new file mode 100644 index 0000000..3d13335 --- /dev/null +++ b/requirements/requirements-py3.txt @@ -0,0 +1,2 @@ +-r requirements-common.txt +mysqlclient==1.3.9 |