Skip to content

Commit a515db4

Browse files
Sync with boilerplate
1 parent d19ceaf commit a515db4

7 files changed

Lines changed: 8 additions & 8 deletions

File tree

.copier-answers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# https://copier.readthedocs.io/en/stable/updating/#never-change-the-answers-file-manually
55
# To update, run (from the project root):
66
# uvx copier update --vcs-ref main --skip-answered --trust --skip-tasks --data {question}={answer}
7-
_commit: 20a9a54
7+
_commit: af784db
88
_src_path: https://github.com/saritasa-nest/saritasa-python-boilerplate-open-source.git
99
folder_name: saritasa_s3_tools
1010
min_python_version: 3.11

.github/renovate.json5

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@
5454
// https://github.com/renovatebot/renovate/pull/41913
5555
minimumReleaseAgeBehaviour: "timestamp-optional",
5656

57+
// https://docs.renovatebot.com/configuration-options/#automergestrategy
58+
// Auto merge PRs without merge commits to keep history cleaner.
59+
automergeStrategy: "rebase",
60+
5761
// https://docs.renovatebot.com/configuration-options/#lockfilemaintenance
5862
// Enable regular refreshes of lock files to have the latest versions of
5963
// sub dependencies. Without it, renovate will update just direct
@@ -92,7 +96,6 @@
9296
automerge: true,
9397
matchFileNames: [
9498
"pyproject.toml",
95-
"poetry.lock",
9699
"uv.lock",
97100
],
98101
schedule: [

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ repos:
4949
- id: gitleaks
5050

5151
- repo: https://github.com/astral-sh/ruff-pre-commit
52-
rev: v0.15.20
52+
rev: v0.16.1
5353
hooks:
5454
- id: ruff-check
5555
args: [

example/manage.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#!/usr/bin/env python
21
import os
32
import sys
43

saritasa_s3_tools/testing/plugin.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,4 +336,3 @@ def django_adjust_s3_bucket(s3_bucket: str) -> None:
336336
if isinstance(storage_instance, s3.S3Storage):
337337
storage_instance.bucket_name = s3_bucket # type: ignore
338338
settings.AWS_STORAGE_BUCKET_NAME = s3_bucket
339-
return None

tasks.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@
1010
invocations.docs,
1111
invocations.project,
1212
saritasa_invocations.docker,
13+
saritasa_invocations.pytest,
14+
saritasa_invocations.uv,
1315
saritasa_invocations.git,
1416
saritasa_invocations.github_actions,
1517
saritasa_invocations.pre_commit,
1618
saritasa_invocations.python,
1719
saritasa_invocations.system,
1820
saritasa_invocations.poetry,
1921
saritasa_invocations.mypy,
20-
saritasa_invocations.pytest,
2122
saritasa_invocations.django,
2223
saritasa_invocations.open_api,
2324
)

tests/test_django/test_params_validation.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ def test_content_length_validation_lower(
9797
f"Invalid file size - {humanize.naturalsize(content_length)} of "
9898
"test.txt. Need between 1.0 kB and 20.0 MB."
9999
), response.data
100-
return
101100

102101

103102
def test_content_type_validation(
@@ -121,7 +120,6 @@ def test_content_type_validation(
121120
"Invalid file type - `test/pytest` of `test.txt`. "
122121
"Expected: text/plain."
123122
), response.data
124-
return
125123

126124

127125
@pytest.mark.parametrize(

0 commit comments

Comments
 (0)