diff --git a/.gitignore b/.gitignore index f1f783a..ff8accb 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ __pycache__/ .coverage .coveralls.yml db.sqlite3* -/django_admin_more_filters.egg-info/ +/django_more_admin_filters.egg-info/ /build/ /dist/ /.tox/ diff --git a/.travis.yml b/.travis.yml index b7157a5..ac2e09e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,7 +47,7 @@ install: - pip install -U pip setuptools coveralls - pip install $REQ - pip install --editable . -script: "coverage run --source more_filters/ tests/manage.py test testapp" +script: "coverage run --source more_admin_filters/ tests/manage.py test testapp" after_success: - coverage report - coveralls diff --git a/MANIFEST.in b/MANIFEST.in index c937cb2..21fa6dd 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,3 @@ include LICENSE include README.rst -recursive-include more_filters/templates * +recursive-include more_admin_filters/templates * diff --git a/README.rst b/README.rst index 7500a0c..e21165e 100644 --- a/README.rst +++ b/README.rst @@ -13,7 +13,7 @@ Welcome to django-admin--more-filters Description =========== -Django-admin-more-filters is a collection of django admin filters with a focus +Django-more-admin-filters is a collection of django admin filters with a focus on filters allowing multiple choices and the support of dropdown widgets. @@ -21,18 +21,18 @@ Installation ============ Install from pypi.org:: - pip install django-admin-more-filters + pip install django-more-admin-filters -Add more_filters to your installed apps:: +Add more_admin_filters to your installed apps:: INSTALLED_APPS = [ - 'more_filters', + 'more_admin_filters', ... ] Use the filter classes with your ModelAdmin:: - from more_filters import MultiSelectDropdownFilter + from more_admin_filters import MultiSelectDropdownFilter class MyModelAdmin(admin.ModelAdmin): ... diff --git a/more_filters/__init__.py b/more_admin_filters/__init__.py similarity index 100% rename from more_filters/__init__.py rename to more_admin_filters/__init__.py diff --git a/more_filters/apps.py b/more_admin_filters/apps.py similarity index 68% rename from more_filters/apps.py rename to more_admin_filters/apps.py index cb9beae..ed27bbc 100644 --- a/more_filters/apps.py +++ b/more_admin_filters/apps.py @@ -2,4 +2,4 @@ from django.apps import AppConfig class DjangoAdminSelectfilterConfig(AppConfig): - name = 'django_admin_more_filters' + name = 'django_more_admin_filters' diff --git a/more_filters/filters.py b/more_admin_filters/filters.py similarity index 100% rename from more_filters/filters.py rename to more_admin_filters/filters.py diff --git a/more_filters/templates/dropdownfilter.html b/more_admin_filters/templates/dropdownfilter.html similarity index 100% rename from more_filters/templates/dropdownfilter.html rename to more_admin_filters/templates/dropdownfilter.html diff --git a/more_filters/templates/multiselectdropdownfilter.html b/more_admin_filters/templates/multiselectdropdownfilter.html similarity index 100% rename from more_filters/templates/multiselectdropdownfilter.html rename to more_admin_filters/templates/multiselectdropdownfilter.html diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..d3a0d83 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,25 @@ +appdirs==1.4.4 +asgiref==3.2.10 +certifi==2020.6.20 +chardet==3.0.4 +coverage==5.2.1 +coveralls==2.1.2 +distlib==0.3.1 +Django==2.2.16 +docopt==0.6.2 +filelock==3.0.12 +idna==2.10 +importlib-metadata==1.7.0 +packaging==20.4 +pluggy==0.13.1 +py==1.9.0 +pyparsing==2.4.7 +pytz==2020.1 +requests==2.24.0 +six==1.15.0 +sqlparse==0.3.1 +toml==0.10.1 +tox==3.20.0 +urllib3==1.25.10 +virtualenv==20.0.31 +zipp==3.1.0 diff --git a/setup.py b/setup.py index a63ad81..b4cd6b0 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ def read(filename): return file.read() -version = __import__("more_filters").__version__ +version = __import__("more_admin_filters").__version__ if '-dev' in version: dev_status = 'Development Status :: 3 - Alpha' elif '-beta' in version: @@ -21,7 +21,7 @@ else: setup( - name="django-admin-more-filters", + name="django-more-admin-filters", version=version, description="Additional filters for django-admin.", long_description=read("README.rst"), diff --git a/tests/testapp/admin.py b/tests/testapp/admin.py index 18bd7fa..6449424 100644 --- a/tests/testapp/admin.py +++ b/tests/testapp/admin.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from django.contrib import admin -from more_filters import ( +from more_admin_filters import ( MultiSelectFilter, MultiSelectRelatedFilter, MultiSelectDropdownFilter, MultiSelectRelatedDropdownFilter, DropdownFilter, ChoicesDropdownFilter, RelatedDropdownFilter, BooleanAnnotationFilter diff --git a/tests/testapp/settings.py b/tests/testapp/settings.py index bf2e736..a6e3b5a 100644 --- a/tests/testapp/settings.py +++ b/tests/testapp/settings.py @@ -33,7 +33,7 @@ ALLOWED_HOSTS = [] INSTALLED_APPS = [ 'testapp', - 'more_filters', + 'more_admin_filters', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes',