Merge remote-tracking branch 'upstream/master'

Author: alexphelps

README.md

@@ -13,7 +13,7 @@ filtering sidebar to avoid this problem.
 Install:
 
 ```sh
-pip install git+http://github.com/mrts/django-admin-list-filter-dropdown.git
+pip install django-admin-list-filter-dropdown
 ```
 
 Enable in `settings.py`:
@@ -46,7 +46,7 @@ class EntityAdmin(admin.ModelAdmin):
 
 Here's what it looks like:
 
-![Screenshot of dropdown admin filter](docs/list-filter-dropdown.png)
+![Screenshot of dropdown admin filter](https://raw.githubusercontent.com/mrts/django-admin-list-filter-dropdown/master/docs/list-filter-dropdown.png)
 
 # Credits
 

django_admin_listfilter_dropdown/filters.py

@@ -1,7 +1,10 @@
-from django.contrib.admin.filters import AllValuesFieldListFilter, RelatedFieldListFilter
+from django.contrib.admin.filters import AllValuesFieldListFilter, RelatedFieldListFilter, ChoicesFieldListFilter
 
 class DropdownFilter(AllValuesFieldListFilter):
     template = 'django_admin_listfilter_dropdown/dropdown_filter.html'
 
+class ChoiceDropdownFilter(ChoicesFieldListFilter):
+    template = 'django_admin_listfilter_dropdown/dropdown_filter.html'
+
 class RelatedDropdownFilter(RelatedFieldListFilter):
     template = 'django_admin_listfilter_dropdown/dropdown_filter.html'

docs/register-with-converting-README.md-to-reStructuredTxt.py

@@ -0,0 +1,9 @@
+import pandoc
+import os
+
+doc = pandoc.Document()
+doc.markdown = open('README.md').read()
+with open('README.txt','w+') as f:
+    f.write(doc.rst)
+os.system("python setup.py register")
+os.remove('README.txt')

setup.py

@@ -3,19 +3,29 @@
 import os
 from setuptools import find_packages, setup
 
+VERSION = '1.0.1'
+
 # allow setup.py to be run from any path
 os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
 
+description = 'Use dropdowns in Django admin list filter'
+long_description = description
+if os.path.exists('README.txt'):
+    long_description = open('README.txt').read()
+
 setup(
     name='django-admin-list-filter-dropdown',
-    version='1.0.0',
+    version=VERSION,
     packages=find_packages(),
     include_package_data=True,
     license='MIT License',
-    description='Use dropdowns in Django admin list filter',
+    description=description,
+    long_description=long_description,
     url='https://github.com/mrts/django-admin-list-filter-dropdown',
+    download_url='https://github.com/mrts/django-admin-list-filter-dropdown/archive/%s.zip' % VERSION,
     author='Mart Sõmermaa',
     author_email="mrts.pydev at gmail dot com",
+    keywords=['django', 'admin', 'filter', 'dropdown'],
     classifiers=[
         'Environment :: Web Environment',
         'Framework :: Django',