updates

Author: saxix

.bumpversion.cfg

@@ -1,18 +1,13 @@
 .*
 ~*
-*.lock
 build
+dist
 __pycache__
 *.egg-info
 !docs/**/.pages
 !.gitignore
 !.github
-!.bumpversion.cfg
-!.flake8
-!.isort.cfg
-!.readthedocs.yaml
-.travis.yml
-dist/
 coverage.xml
 pytest.xml
 docs/images/*.mov
+src/adminfilters/version.py

.flake8

@@ -1,49 +1,35 @@
-exclude: '^$'
-fail_fast: false
 repos:
-  - repo: local
-    hooks:
-
-      - id: isort
-        args: ['--check-only', '--settings', '.isort.cfg']
-        exclude: tweepy
-        name: isort
-        entry: isort
-        language: system
-        types: [python]
-        stages: [commit]
-
-      - id: flake8
-        exclude: /(_plugin_template|python_twitter|migrations|tweepy)/
-        name: flake8
-        entry: flake8
-        language: system
-        types: [python]
-        stages: [commit]
-
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.1.0
-    hooks:
-#      - id: double-quote-string-fixer
-#        stages: [commit]
-
-      - id: debug-statements
-        stages: [commit]
-
-      - id: end-of-file-fixer
-        exclude: .bumpversion.cfg
-        stages: [commit]
-
-      - id: check-merge-conflict
-        stages: [commit]
-
-      - id: check-case-conflict
-        stages: [commit]
-
-  - repo: https://github.com/saxix/pch
-    rev: fc387f4
-    hooks:
-      - id: check-missed-migrations
-        args:
-          - src
-        stages: [commit]
+    -   repo: https://github.com/pre-commit/pre-commit-hooks
+        rev: v5.0.0
+        hooks:
+            -   id: end-of-file-fixer
+            -   id: trailing-whitespace
+    -   repo: https://github.com/python-jsonschema/check-jsonschema
+        rev: 0.31.2
+        hooks:
+            -   id: check-github-workflows
+                args: [ "--verbose" ]
+    -   repo: https://github.com/tox-dev/tox-ini-fmt
+        rev: "1.5.0"
+        hooks:
+            -   id: tox-ini-fmt
+                args: [ "-p", "lint" ]
+    -   repo: https://github.com/tox-dev/pyproject-fmt
+        rev: "v2.5.1"
+        hooks:
+            -   id: pyproject-fmt
+    -   repo: https://github.com/astral-sh/ruff-pre-commit
+        rev: "v0.9.9"
+        hooks:
+            -   id: ruff-format
+            -   id: ruff
+                args: [ "--fix", "--unsafe-fixes", "--exit-non-zero-on-fix" ]
+#    -   repo: https://github.com/adamchainz/djade-pre-commit
+#        rev: "1.3.2"
+#        hooks:
+#            -   id: djade
+#                args: [ --check, --target-version, "5.1" ]
+    -   repo: meta
+        hooks:
+            -   id: check-hooks-apply
+            -   id: check-useless-excludes

.gitignore

@@ -8,9 +8,9 @@ Release 2.5.1
 =============
 * limit select2.css customisation be applied only to filters
 * Enabling better AutocompleteFilter customisation
+* PEP 621 support (pyproject.toml)
 
 
-* PEP 621 support (pyproject.toml)
 Release 2.5
 ===========
 * PEP 621 support (pyproject.toml)

.isort.cfg

@@ -7,23 +7,17 @@ include setup.py
 include setup.cfg
 include tox.ini
 
-recursive-include docs *.py
 recursive-include src *.html
 recursive-include src *.json
 recursive-include src *.py
 recursive-include src *.js
 recursive-include src *.css
-recursive-include src *.coveragerc
-recursive-include src *.pip
 
-recursive-include tests *
+recursive-exclude tests *
 
 recursive-exclude tests *.pyc
 recursive-exclude src *.pyc
 recursive-exclude tests ~*
 recursive-exclude src ~*
 
 exclude Makefile
-exclude .bumpversion.cfg
-exclude .isort.cfg
-exclude .flake8

.pre-commit-config.yaml

@@ -26,10 +26,6 @@ lint:  ## code lint
 	tox -e lint
 	#pre-commit run --all-files
 
-develop:  ## setup development env
-	python3 -m venv ./.venv
-	./.venv/bin/pip install -r src/requirements/testing.pip
-	./.venv/bin/pip install -r src/requirements/develop.pip
 
 demo:  ## run demo app
 	cd tests/demoapp && python manage.py makemigrations demo
@@ -48,33 +44,3 @@ fullclean:  ## clean development directory
 
 test:  ## run test
 	 py.test src tests -vv --capture=no --doctest-modules --cov=adminfilters --cov-report=html --cov-config=tests/.coveragerc
-
-docs: .mkbuilddir
-	@sh docs/to_gif.sh docs/images
-	@mkdir -p ${BUILDDIR}/docs
-	sphinx-build -aE docs ${BUILDDIR}/docs
-
-bump:   ## Bumps version
-	@while :; do \
-		read -r -p "bumpversion [major/minor/release]: " PART; \
-		case "$$PART" in \
-			major|minor|release) break ;; \
-  		esac \
-	done ; \
-	bumpversion --no-commit --allow-dirty $$PART
-	@grep "^VERSION " src/adminfilters/__init__.py
-
-
-heroku:
-	@git checkout heroku
-	@git merge develop -m "merge develop"
-	@git push heroku heroku:master
-	@git checkout develop
-	@echo "check demo at https://django-adminfilters.herokuapp.com/"
-
-heroku-reset: heroku
-	heroku pg:reset --confirm django-adminfilters
-	heroku config:set DEBUG=true
-	heroku run python tests/demoapp/manage.py migrate
-	heroku run python tests/demoapp/manage.py init_demo
-	heroku run python tests/demoapp/manage.py collectstatic --noinput

.readthedocs.yaml

@@ -8,7 +8,9 @@ Demo can be found at https://django-adminfilters.herokuapp.com/demo/artist/
 [![Pypi](https://badge.fury.io/py/django-adminfilters.svg)](https://pypi.org/project/django-adminfilters/)
 [![coverage](https://codecov.io/github/saxix/django-adminfilters/coverage.svg?branch=develop)](https://codecov.io/github/saxix/django-adminfilters?branch=develop)
 [![Test](https://github.com/saxix/django-adminfilters/actions/workflows/test.yml/badge.svg)](https://github.com/saxix/django-adminfilters/actions/workflows/test.yml)
-[![ReadTheDocs](https://readthedocs.org/projects/django-adminfilters/badge/?version=latest)](https://django-adminfilters.readthedocs.io/en/latest/)
+[![Django](https://img.shields.io/pypi/frameworkversions/django/django-adminfilters)](https://pypi.org/project/django-adminfilters/)
+
+[//]: # ([![Supported Python versions](https://img.shields.io/pypi/pyversions/pdf-cli.svg)](https://pypi.org/project/pdf-cli/))
 
 
 https://user-images.githubusercontent.com/27282/153727131-d875f946-a8a8-4d89-be83-1d8cb5c9391a.mp4