From c93cfd856a80692328b309b46f2a4d648305c7da Mon Sep 17 00:00:00 2001 From: sax Date: Wed, 1 Nov 2023 20:13:14 +0100 Subject: [PATCH 1/4] bump version --- .bumpversion.cfg | 2 +- CHANGES | 4 ++-- src/adminactions/__init__.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 23b072f..2a3118e 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.1.0 +current_version = 2.2.0 parse = (?P\d+)\.(?P\d+)\.(?P\d+) serialize = {major}.{minor}.{patch} commit = False diff --git a/CHANGES b/CHANGES index 0358492..8e77af1 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,5 @@ -Release -============= +Release 2.2 +=========== * new `MassUpdateForm.sort_fields`. Make optional MassUpdateForm fields sorting * make possible globally customize MassUpdateForm * removes async feature from Bulk update diff --git a/src/adminactions/__init__.py b/src/adminactions/__init__.py index 24d30ab..9a62606 100644 --- a/src/adminactions/__init__.py +++ b/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" From 7753ac39ab7543d09bfc4ecbbc1281d314607cd7 Mon Sep 17 00:00:00 2001 From: sax Date: Wed, 1 Nov 2023 20:15:40 +0100 Subject: [PATCH 2/4] update github actions --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1cb5580..75aa4a3 100644 --- a/.github/workflows/test.yml +++ b/.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 From 6dfbf4f0779ae78822b76ed5cf07686b9795c296 Mon Sep 17 00:00:00 2001 From: sax Date: Fri, 10 Nov 2023 12:15:32 +0100 Subject: [PATCH 3/4] updates --- .pre-commit-config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index cd152cb..21df7fb 100644 --- a/.pre-commit-config.yaml +++ b/.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] From 069d06c0107a20dae7f33e005d01af5e0bedafd6 Mon Sep 17 00:00:00 2001 From: sax Date: Fri, 10 Nov 2023 14:20:21 +0100 Subject: [PATCH 4/4] updates --- .gitignore | 1 - pyproject.toml | 11 +++++++++++ src/requirements/testing.pip | 3 ++- 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 pyproject.toml diff --git a/.gitignore b/.gitignore index 5c690e0..706cdcf 100644 --- a/.gitignore +++ b/.gitignore @@ -19,5 +19,4 @@ sonar-project.properties Pipfile Pipfile.lock poetry.lock -pyproject.toml .venv/ diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..0417f72 --- /dev/null +++ b/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" diff --git a/src/requirements/testing.pip b/src/requirements/testing.pip index 713c963..58e83df 100644 --- a/src/requirements/testing.pip +++ b/src/requirements/testing.pip @@ -19,5 +19,6 @@ readme selenium>=2.42.0 setuptools>=15.0 tox<4 -#WebTest==2.0.7 +isort +black