Fixing setup.py and releasing 4.3.0.

Internal_Notes.md

@@ -7,4 +7,25 @@ Uploading bundle to PyPi
 ========================
 
     $ python setup.py sdist upload
-    
+    
+    OR
+
+
+    $ python setup.py sdist upload -r pypi
+
+    This needs we have a ~/.pypi file. Its content should be like:-
+
+[distutils] # this tells distutils what package indexes you can push to
+index-servers =
+    pypi
+    pypitest #Optional
+
+[pypi]
+repository: https://pypi.python.org/pypi
+username: <username>
+password: <password>
+
+[pypitest] #Optional
+repository: https://testpypi.python.org/pypi
+username: <username>
+password: <password>

MANIFEST.in

@@ -5,3 +5,4 @@ recursive-include django_select2/templatetags *.*
 recursive-exclude django_select2/templatetags .DS_Store *.pyc
 exclude UK_Advanced_Cryptics_Dictionary_Licensing_Information.txt
 exclude Internal_Notes.md
+prune tests

README

@@ -51,9 +51,20 @@ Special Thanks
 
 * Samuel Goldszmidt (@ouhouhsami) for reporting many fundamental issues with the code, because of which versions 2.0 and 2.0.1 were released.
 
+Official Contributors
+=====================
+
+* Johannes Hoppe (@codingjoe)
+
 Changelog Summary
 =================
 
+### v4.3.0
+
+* Now the package supports both Python2 and Python3.
+* Django 1.8 support added.
+* Many bug fixes.
+
 ### v4.2.2
 
 * Misc fixes and enhancements - [61](https://github.com/applegrew/django-select2/pull/61), [64](https://github.com/applegrew/django-select2/issues/64).

README.md

@@ -51,9 +51,20 @@ Special Thanks
 
 * Samuel Goldszmidt (@ouhouhsami) for reporting many fundamental issues with the code, because of which versions 2.0 and 2.0.1 were released.
 
+Official Contributors
+=====================
+
+* Johannes Hoppe (@codingjoe)
+
 Changelog Summary
 =================
 
+### v4.3.0
+
+* Now the package supports both Python2 and Python3.
+* Django 1.8 support added.
+* Many bug fixes.
+
 ### v4.2.2
 
 * Misc fixes and enhancements - [61](https://github.com/applegrew/django-select2/pull/61), [64](https://github.com/applegrew/django-select2/issues/64).

django_select2/__init__.py

@@ -81,7 +81,7 @@ from __future__ import absolute_import, unicode_literals
 import logging
 logger = logging.getLogger(__name__)
 
-__version__ = "4.2.2"
+__version__ = "4.3.0"
 
 __RENDER_SELECT2_STATICS = False
 __ENABLE_MULTI_PROCESS_SUPPORT = False

django_select2/static/django_select2/js/heavy_data.min.js

@@ -1 +1 @@
-if(!window.django_select2){window.django_select2={MULTISEPARATOR:String.fromCharCode(31),get_url_params:function(c,e,b){var d=$(this).data("field_id"),a={term:c,page:e,context:b};if(d){a.field_id=d}return a},process_results:function(d,c,b){var a;if(d.err&&d.err.toLowerCase()==="nil"){a={results:d.results};if(b){a.context=b}if(d.more===true||d.more===false){a.more=d.more}}else{a={results:[]}}if(a.results){$(this).data("results",a.results)}else{$(this).removeData("results")}return a},onValChange:function(){django_select2.updateText($(this))},prepareValText:function(d,a,c){var b=[];$(d).each(function(e){b.push({id:this,text:a[e]})});if(c){return b}else{if(b.length>0){return b[0]}else{return null}}},updateText:function(b){var f=b.select2("val"),d=b.select2("data"),a=b.txt(),c=!!b.attr("multiple"),e;if(f||f===0){if(c){if(f.length!==a.length){a=[];$(f).each(function(g){var h,j=this,k;for(h in d){k=d[h].id;if(k instanceof String){k=k.valueOf()}if(k==j){a.push(d[h].text)}}})}}else{a=d.text}b.txt(a)}else{b.txt("")}},getValText:function(b){var g=b.select2("val"),c=b.data("results"),a=b.txt(),e=!!b.attr("multiple"),d,h=b.attr("id");if(g||g===0){if(!e){g=[g];if(a||a===0){a=[a]}}if(a===0||(a&&g.length===a.length)){return[g,a]}d=b.data("userGetValText");if(d){a=d(b,g,e);if(a||a===0){return[g,a]}}if(c){a=[];$(g).each(function(f){var j,k=this;for(j in c){if(c[j].id==k){g[f]=c[j].id;a.push(c[j].text)}}});if(a||a===0){return[g,a]}}}return null},onInit:function(b,f){b=$(b);var d=b.attr("id"),a=null,c=b.select2("val");if(!c&&c!==0){c=b.data("initVal")}if(c||c===0){a=django_select2.getValText(b);if(a&&a[0]){a=django_select2.prepareValText(a[0],a[1],!!b.attr("multiple"))}}if(!a){b.val(null)}f(a);django_select2.updateText(b)},createSearchChoice:function(a,b){if(!b||$(b).filter(function(){return this.text.localeCompare(a)===0}).length===0){return{id:a,text:a}}},onMultipleHiddenChange:function(){var b=$(this),d=b.data("valContainer"),a=b.data("name"),c=b.val();d.empty();if(c){c=c.split(django_select2.MULTISEPARATOR);$(c).each(function(){var e=$('<input type="hidden">').appendTo(d);e.attr("name",a);e.val(this)})}},initMultipleHidden:function(a){var b;a.data("name",a.attr("name"));a.attr("name","");b=$("<div>").insertAfter(a).css({display:"none"});a.data("valContainer",b);a.change(django_select2.onMultipleHiddenChange);if(a.val()){a.change()}},convertArrToStr:function(a){return a.join(django_select2.MULTISEPARATOR)},runInContextHelper:function(a,b){return function(){var c=Array.prototype.slice.call(arguments,0);return a.apply($("#"+b).get(0),c)}},logErr:function(){if(console&&console.error){args=Array.prototype.slice.call(arguments);console.error.apply(console,args)}}};(function(b){if(b){for(var a in django_select2){var c=django_select2[a];if(typeof(c)=="function"){django_select2[a]=(function(d,e){return function(){console.log("Function "+d+" called for object: ",this);return e.apply(this,arguments)}}(a,c))}}}}(false));(function(a){a.fn.txt=function(b){if(typeof(b)!=="undefined"){if(b){if(b instanceof Array){if(this.attr("multiple")){b=django_select2.convertArrToStr(b)}else{b=b[0]}}this.attr("txt",b)}else{this.removeAttr("txt")}return this}else{b=this.attr("txt");if(this.attr("multiple")){if(b){b=b.split(django_select2.MULTISEPARATOR)}else{b=[]}}return b}}})(jQuery)};
+if(!window.django_select2){window.django_select2={MULTISEPARATOR:String.fromCharCode(31),get_url_params:function(c,e,b){var d=jQuery(this).data("field_id"),a={term:c,page:e,context:b};if(d){a.field_id=d}return a},process_results:function(d,c,b){var a;if(d.err&&d.err.toLowerCase()==="nil"){a={results:d.results};if(b){a.context=b}if(d.more===true||d.more===false){a.more=d.more}}else{a={results:[]}}if(a.results){jQuery(this).data("results",a.results)}else{jQuery(this).removeData("results")}return a},onValChange:function(){django_select2.updateText(jQuery(this))},prepareValText:function(d,a,c){var b=[];jQuery(d).each(function(e){b.push({id:this,text:a[e]})});if(c){return b}else{if(b.length>0){return b[0]}else{return null}}},updateText:function(b){var f=b.select2("val"),d=b.select2("data"),a=b.txt(),c=!!b.attr("multiple"),e;if(f||f===0){if(c){if(f.length!==a.length){a=[];jQuery(f).each(function(g){var h,j=this,k;for(h in d){k=d[h].id;if(k instanceof String){k=k.valueOf()}if(k==j){a.push(d[h].text)}}})}}else{a=d.text}b.txt(a)}else{b.txt("")}},getValText:function(b){var g=b.select2("val"),c=b.data("results"),a=b.txt(),e=!!b.attr("multiple"),d,h=b.attr("id");if(g||g===0){if(!e){g=[g];if(a||a===0){a=[a]}}if(a===0||(a&&g.length===a.length)){return[g,a]}d=b.data("userGetValText");if(d){a=d(b,g,e);if(a||a===0){return[g,a]}}if(c){a=[];jQuery(g).each(function(f){var j,k=this;for(j in c){if(c[j].id==k){g[f]=c[j].id;a.push(c[j].text)}}});if(a||a===0){return[g,a]}}}return null},onInit:function(b,f){b=jQuery(b);var d=b.attr("id"),a=null,c=b.select2("val");if(!c&&c!==0){c=b.data("initVal")}if(c||c===0){a=django_select2.getValText(b);if(a&&a[0]){a=django_select2.prepareValText(a[0],a[1],!!b.attr("multiple"))}}if(!a){b.val(null)}f(a);django_select2.updateText(b)},createSearchChoice:function(a,b){if(!b||jQuery(b).filter(function(){return this.text.localeCompare(a)===0}).length===0){return{id:a,text:a}}},onMultipleHiddenChange:function(){var b=jQuery(this),d=b.data("valContainer"),a=b.data("name"),c=b.val();d.empty();if(c){c=c.split(django_select2.MULTISEPARATOR);jQuery(c).each(function(){var e=jQuery('<input type="hidden">').appendTo(d);e.attr("name",a);e.val(this)})}},initMultipleHidden:function(a){var b;a.data("name",a.attr("name"));a.attr("name","");b=jQuery("<div>").insertAfter(a).css({display:"none"});a.data("valContainer",b);a.change(django_select2.onMultipleHiddenChange);if(a.val()){a.change()}},convertArrToStr:function(a){return a.join(django_select2.MULTISEPARATOR)},runInContextHelper:function(a,b){return function(){var c=Array.prototype.slice.call(arguments,0);return a.apply(jQuery("#"+b).get(0),c)}},logErr:function(){if(console&&console.error){args=Array.prototype.slice.call(arguments);console.error.apply(console,args)}}};(function(b){if(b){for(var a in django_select2){var c=django_select2[a];if(typeof(c)=="function"){django_select2[a]=(function(d,e){return function(){console.log("Function "+d+" called for object: ",this);return e.apply(this,arguments)}}(a,c))}}}}(false));(function(a){a.fn.txt=function(b){if(typeof(b)!=="undefined"){if(b){if(b instanceof Array){if(this.attr("multiple")){b=django_select2.convertArrToStr(b)}else{b=b[0]}}this.attr("txt",b)}else{this.removeAttr("txt")}return this}else{b=this.attr("txt");if(this.attr("multiple")){if(b){b=b.split(django_select2.MULTISEPARATOR)}else{b=[]}}return b}}})(jQuery)};

setup.py

@@ -34,7 +34,7 @@ def minify(files, outfile, ftype):
     content = ''
 
     for filename in files:
-        with io.open(getPkgPath() + filename, 'rb', encoding='utf8') as f:
+        with io.open(getPkgPath() + filename, 'r', encoding='utf8') as f:
             content = f.read()
 
     data = {
@@ -52,19 +52,19 @@ def minify(files, outfile, ftype):
 
 
 if len(sys.argv) > 1 and 'sdist' == sys.argv[1]:
-    minify(['static/js/select2.js'], 'static/js/select2.min.js', 'js')
-    minify(['static/js/heavy_data.js'], 'static/js/heavy_data.min.js', 'js')
-    minify(['static/css/select2.css'], 'static/css/select2.min.css', 'css')
-    minify(['static/css/select2.css', 'static/css/extra.css'],
-           'static/css/all.min.css', 'css')
-    minify(['static/css/select2.css', 'static/css/select2-bootstrap.css'],
-           'static/css/select2-bootstrapped.min.css', 'css')
+    minify(['static/django_select2/js/select2.js'], 'static/django_select2/js/select2.min.js', 'js')
+    minify(['static/django_select2/js/heavy_data.js'], 'static/django_select2/js/heavy_data.min.js', 'js')
+    minify(['static/django_select2/css/select2.css'], 'static/django_select2/css/select2.min.css', 'css')
+    minify(['static/django_select2/css/select2.css', 'static/django_select2/css/extra.css'],
+           'static/django_select2/css/all.min.css', 'css')
+    minify(['static/django_select2/css/select2.css', 'static/django_select2/css/select2-bootstrap.css'],
+           'static/django_select2/css/select2-bootstrapped.min.css', 'css')
     minify(
         [
-            'static/css/select2.css',
-            'static/css/extra.css',
-            'static/css/select2-bootstrap.css'
-        ], 'static/css/all-bootstrapped.min.css', 'css')
+            'static/django_select2/css/select2.css',
+            'static/django_select2/css/extra.css',
+            'static/django_select2/css/select2-bootstrap.css'
+        ], 'static/django_select2/css/all-bootstrapped.min.css', 'css')
 
 
 class PyTest(Command):
@@ -93,7 +93,7 @@ setup(
     author_email=AUTHOR_EMAIL,
     license="LICENSE.txt",
     url=URL,
-    packages=find_packages(exclude=['tests']),
+    packages=find_packages(),
     include_package_data=True,
     classifiers=[
         "Development Status :: 5 - Production/Stable",