Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/2.2 #223

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,4 @@ sonar-project.properties
Pipfile
Pipfile.lock
poetry.lock
pyproject.toml
.venv/
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
4 changes: 2 additions & 2 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -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
Expand Down
11 changes: 11 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion src/adminactions/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
VERSION = __version__ = "2.1.0"
VERSION = __version__ = "2.2.0"
NAME = "django-adminactions"
default_app_config = "adminactions.apps.Config"
3 changes: 2 additions & 1 deletion src/requirements/testing.pip
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@ readme
selenium>=2.42.0
setuptools>=15.0
tox<4
#WebTest==2.0.7
isort
black