Merge tag '2.2' into develop

v2.2

* tag '2.2':
  updates
  updates
  update github actions
  bump version

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.1.0
+current_version = 2.2.0
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)
 serialize = {major}.{minor}.{patch}
 commit = False

.github/workflows/test.yml

@@ -16,7 +16,7 @@ jobs:
 
  - name: Install dependencies
  run: |
- python -m pip install --upgrade pip pre-commit
+ python -m pip install --upgrade pip pre-commit black isort flake8
  - name: Lint with flake8
  run: |
  pre-commit run --all

.gitignore

@@ -19,5 +19,4 @@ sonar-project.properties
 Pipfile
 Pipfile.lock
 poetry.lock
-pyproject.toml
 .venv/

.pre-commit-config.yaml

@@ -6,16 +6,16 @@ repos:
  - id: black
  name: black
  entry: black
- language: system
+ language: python
  types: [python]
  require_serial: true
  - id: isort
  name: isort
  entry: isort
- language: system
+ language: python
  types: [python]
  - id: flake8
  name: flake8
  entry: flake8
- language: system
+ language: python
  types: [python]

CHANGES

@@ -1,5 +1,5 @@
-Release <dev>
-=============
+Release 2.2
+===========
 * new `MassUpdateForm.sort_fields`. Make optional MassUpdateForm fields sorting
 * make possible globally customize MassUpdateForm
 * removes async feature from Bulk update

pyproject.toml

@@ -0,0 +1,11 @@
+[tool.black]
+line-length = 110
+target-version = ['py39']
+
+
+[tool.isort]
+profile = "black"
+line_length = 110
+lines_between_sections = 1
+known_first_party = "adminactions"
+skip = "migrations"

src/adminactions/__init__.py

@@ -1,3 +1,3 @@
-VERSION = __version__ = "2.1.0"
+VERSION = __version__ = "2.2.0"
 NAME = "django-adminactions"
 default_app_config = "adminactions.apps.Config"

src/requirements/testing.pip

@@ -19,5 +19,6 @@ readme
 selenium>=2.42.0
 setuptools>=15.0
 tox<4
-#WebTest==2.0.7
+isort
+black