From 516284689fa9daa9b4487e4c5683997111df6049 Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Mon, 15 Jun 2015 18:23:29 +0530
Subject: Modify installer script and cleanup; - Add __init__.py - Add
 templates dir to MANIFEST - Add persistent store for project details - Modify
 initial_data.json - Fix imports

Conflicts:
	testapp/templates/demo_settings.py
---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index 79efa76..efd57c4 100644
--- a/setup.py
+++ b/setup.py
@@ -20,6 +20,7 @@ setup(
     entry_points = {
             'console_scripts': [
                 'code_server = testapp.exam.code_server:main',
+                'vimarsh = testapp.scripts.vimarsh:main',
             ],
     },
     description='A django app to conduct online tests.',
-- 
cgit 


From 3f35f7dd0c79f76518a71f597b96c226d08157fb Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Mon, 22 Jun 2015 17:07:13 +0530
Subject: Remove taggit-autocomplete app, make pip compatible

Conflicts:
	testapp/templates/demo_urls.py
---
 setup.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index efd57c4..d5910b6 100644
--- a/setup.py
+++ b/setup.py
@@ -1,13 +1,13 @@
 import os
 from setuptools import setup, find_packages
 
-README = open(os.path.join(os.path.dirname(__file__), 'README.rst')).read()
+README = open(os.path.join(os.path.dirname(__file__), 'README.md')).read()
 
 # allow setup.py to be run from any path
 os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
 
-link = 'git+https://github.com/prathamesh920/\
-django-taggit-autocomplete-modified.git'
+# link = 'git+https://github.com/prathamesh920/\
+# django-taggit-autocomplete-modified.git'
 
 setup(
     name='django-exam',
@@ -29,9 +29,9 @@ setup(
         'django==1.6',
         'mysql-python==1.2.5',
         'django-taggit==0.12.2',
-        'django-taggit-autocomplete-modified > 0.1.0b4',
+        # 'django-taggit-autocomplete-modified > 0.1.0b4',
     ],
-    dependency_links=[link+'#egg=django_taggit_autocomplete_modified-0.2'],
+    # dependency_links=[link+'#egg=django_taggit_autocomplete_modified-0.2'],
     classifiers=[
         'Development Status :: 4 - Beta',
         'Environment :: Web Environment',
-- 
cgit 


From 6399ddce69a71f87a2e164a2b6e77a2f105f4741 Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Mon, 22 Jun 2015 17:09:30 +0530
Subject: - Install script: Add subcommands - Install script: Add code server
 launcher - Add requirements.txt - Edit README to fix changes/errors - Remove
 jquery v1.11.3 and add v1.4.2 - Edit initial_data.json

---
 setup.py | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index d5910b6..a9b23c5 100644
--- a/setup.py
+++ b/setup.py
@@ -6,9 +6,6 @@ README = open(os.path.join(os.path.dirname(__file__), 'README.md')).read()
 # allow setup.py to be run from any path
 os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
 
-# link = 'git+https://github.com/prathamesh920/\
-# django-taggit-autocomplete-modified.git'
-
 setup(
     name='django-exam',
     author='python team at IIT Bombay',
@@ -19,7 +16,6 @@ setup(
     license='BSD License',
     entry_points = {
             'console_scripts': [
-                'code_server = testapp.exam.code_server:main',
                 'vimarsh = testapp.scripts.vimarsh:main',
             ],
     },
@@ -29,9 +25,7 @@ setup(
         'django==1.6',
         'mysql-python==1.2.5',
         'django-taggit==0.12.2',
-        # 'django-taggit-autocomplete-modified > 0.1.0b4',
     ],
-    # dependency_links=[link+'#egg=django_taggit_autocomplete_modified-0.2'],
     classifiers=[
         'Development Status :: 4 - Beta',
         'Environment :: Web Environment',
-- 
cgit