Skip to content

Commit 11715e2

Browse files
authored
Merge branch 'master' into pre-commit-django-upgrade
2 parents eea70a9 + d29ed3f commit 11715e2

File tree

6 files changed

+9
-11
lines changed

6 files changed

+9
-11
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
twine check dist/*
3131
- name: Upload packages to Jazzband
3232
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
33-
uses: pypa/[email protected].3
33+
uses: pypa/[email protected].5
3434
with:
3535
user: jazzband
3636
password: ${{ secrets.JAZZBAND_RELEASE_KEY }}

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ repos:
1313
- id: end-of-file-fixer
1414
- id: trailing-whitespace
1515
- repo: https://github.com/igorshubovych/markdownlint-cli
16-
rev: v0.32.2
16+
rev: v0.33.0
1717
hooks:
1818
- id: markdownlint
1919
- repo: https://github.com/charliermarsh/ruff-pre-commit
2020
# Ruff version.
21-
rev: 'v0.0.257'
21+
rev: 'v0.0.259'
2222
hooks:
2323
- id: ruff
2424
- repo: https://github.com/psf/black
25-
rev: 22.12.0
25+
rev: 23.1.0
2626
hooks:
2727
- id: black
2828
args:

django_fsm_log/backends.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55

66
def _pre_transition_callback(sender, instance, name, source, target, manager, **kwargs):
7-
87
if BaseBackend._get_model_qualified_name__(sender) in settings.DJANGO_FSM_LOG_IGNORED_MODELS:
98
return
109

django_fsm_log/helpers.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33

44
class FSMLogDescriptor:
5-
65
ATTR_PREFIX = "__django_fsm_log_attr_"
76

87
def __init__(self, instance, attribute, value=NOTSET):

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[tool.black]
22
line-length = 119
3-
target-version = ["py311"]
3+
target-version = ["py37"]
44
extend-exclude = "(^/django_fsm_log/migrations/.*$|^docs/.*$)"
55

66
[tool.ruff]
77
line-length = 119
8-
target-version = "py311"
8+
target-version = "py37"
99
select = ["E", "F", "I", "B", "C4", "T20", "TID", "UP"]
1010
exclude = ["django_fsm_log/migrations", ".tox", "build"]

tests/test_model.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def test_by_is_set_when_passed_into_transition(article, user):
4646
log = StateLog.objects.all()[0]
4747
assert user == log.by
4848
with pytest.raises(AttributeError):
49-
article.__django_fsm_log_attr_by
49+
article.__django_fsm_log_attr_by # noqa: B018
5050

5151

5252
def test_by_is_none_when_not_set_in_transition(article):
@@ -63,7 +63,7 @@ def test_description_is_set_when_passed_into_transition(article):
6363
log = StateLog.objects.all()[0]
6464
assert description == log.description
6565
with pytest.raises(AttributeError):
66-
article.__django_fsm_log_attr_description
66+
article.__django_fsm_log_attr_description # noqa: B018
6767

6868

6969
def test_description_is_none_when_not_set_in_transition(article):
@@ -80,7 +80,7 @@ def test_description_can_be_mutated_by_the_transition(article):
8080
log = StateLog.objects.all()[0]
8181
assert description == log.description
8282
with pytest.raises(AttributeError):
83-
article.__django_fsm_log_attr_description
83+
article.__django_fsm_log_attr_description # noqa: B018
8484

8585

8686
def test_default_description(article):

0 commit comments

Comments
 (0)