summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--setup.py15
-rw-r--r--yaksh/templates/yaksh/complete.html2
-rw-r--r--yaksh/templates/yaksh/quit.html2
3 files changed, 5 insertions, 14 deletions
diff --git a/setup.py b/setup.py
index 34a4a54..37ed948 100644
--- a/setup.py
+++ b/setup.py
@@ -1,27 +1,18 @@
import os
from setuptools import setup, find_packages
-import sys
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)))
-install_requires=[
+install_requires = [
'django==1.9.5',
'django-taggit==0.18.1',
'pytz==2016.4',
'python-social-auth==0.2.19',
'tornado',
]
-if sys.version_info[:2] == (2, 7):
- install_requires+=[
- 'mysql-python==1.2.5'
-]
-if sys.version_info[0] >= 3:
- install_requires+=[
- 'mysqlclient==1.3.9'
-]
setup(
name='yaksh',
@@ -30,9 +21,9 @@ setup(
version='0.1.3',
packages=find_packages(),
include_package_data=True,
- url = 'https://pypi.python.org/pypi/yaksh/',
+ url='https://pypi.python.org/pypi/yaksh/',
license='BSD License',
- entry_points = {
+ entry_points={
'console_scripts': [
'yaksh = yaksh.scripts.cli:main',
],
diff --git a/yaksh/templates/yaksh/complete.html b/yaksh/templates/yaksh/complete.html
index 01d5bf6..7bff206 100644
--- a/yaksh/templates/yaksh/complete.html
+++ b/yaksh/templates/yaksh/complete.html
@@ -22,7 +22,7 @@
{% else %}
<tr class="danger">
<td> {{ question }} </td>
- <td> Not Attempted </td>
+ <td> Not completed </td>
{% endif %}
</tr>
</tbody>
diff --git a/yaksh/templates/yaksh/quit.html b/yaksh/templates/yaksh/quit.html
index a897b3c..d18b790 100644
--- a/yaksh/templates/yaksh/quit.html
+++ b/yaksh/templates/yaksh/quit.html
@@ -20,7 +20,7 @@
{% else %}
<tr class="danger">
<td> {{ question }} </td>
- <td> Not Attempted </td>
+ <td> Not completed </td>
{% endif %}
</tr>
</tbody>