Merge pull request #171 from tam0407/fix/use-current-selectable-versi…

…on-instead-of-pipy-version

Fix use current selectable version instead of pipy version

AUTHORS.txt

@@ -23,5 +23,6 @@ Rebecca Lovewell
 Thomas Güttler
 Yuri Khrustalev
 @SaeX
+Tam Huynh
 
 Thanks for all of your work!

example/core/models.py

@@ -1,6 +1,6 @@
 from __future__ import unicode_literals
 
-from six import python_2_unicode_compatible
+from django.utils.six import python_2_unicode_compatible
 
 try:
     from localflavor.us.models import USStateField

example/manage.py

@@ -2,6 +2,10 @@
 import os
 import sys
 
+
+# add parent path to PYTHONPATH so we can use current selectable package instead of installing it from pipy
+sys.path.append(os.path.dirname(os.path.dirname(os.path.realpath(__file__))))
+
 if __name__ == "__main__":
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "example.settings")
 

example/requirements.txt

@@ -1,3 +1,2 @@
 django>=1.4
 django-localflavor
-django-selectable

selectable/templatetags/selectable_tags.py

@@ -13,5 +13,5 @@ def include_jquery_libs(version='1.11.2', ui='1.11.3'):
 
 
 @register.inclusion_tag('selectable/jquery-css.html')
-def include_ui_theme(theme='base', version='1.11.3'):
+def include_ui_theme(theme='smoothness', version='1.11.3'):
     return {'theme': theme, 'version': version}

selectable/tests/test_templatetags.py

@@ -82,15 +82,15 @@ def test_render(self):
         template = Template("{% load selectable_tags %}{% include_ui_theme %}")
         context = Context({})
         result = template.render(context)
-        self.assertUICSS(result, 'base', '1.11.3')
+        self.assertUICSS(result, 'smoothness', '1.11.3')
 
     def test_render_version(self):
         "Render template tag with alternate version."
         template = Template("{% load selectable_tags %}{% include_ui_theme 'base' '1.8.13' %}")
         context = Context({})
         result = template.render(context)
         self.assertUICSS(result, 'base', '1.8.13')
-        
+
     def test_variable_version(self):
         "Render using version from content variable."
         version = '1.8.13'
@@ -105,7 +105,7 @@ def test_render_theme(self):
         context = Context({})
         result = template.render(context)
         self.assertUICSS(result, 'ui-lightness', '1.11.3')
-        
+
     def test_variable_theme(self):
         "Render using theme from content variable."
         theme = 'ui-lightness'