Skip to content

Commit 325502c

Browse files
authored
Merge branch 'main' into dependabot/pip/pillow-12.1.1
2 parents e633f6d + e5a8d8e commit 325502c

File tree

668 files changed

+2530
-2518
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

668 files changed

+2530
-2518
lines changed

.git-blame-ignore-revs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Ruff linting and formatting (#2882)
2+
2cf268f0c3b35973cfb6d5bbcfec5de09954eae7
3+
4+
# Move apps under apps/ namespace and update all imports (#2883)
5+
31bc7e3698333333397292dc01d88e61e41761ab

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ repos:
22
- repo: https://github.com/astral-sh/ruff-pre-commit
33
rev: v0.15.0
44
hooks:
5-
- id: ruff
5+
- id: ruff-check
66
args: [--fix]
77
- id: ruff-format
88

apps/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
"""pythondotorg Django applications package."""
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from django.contrib import admin
44

5-
from banners.models import Banner
5+
from apps.banners.models import Banner
66

77

88
@admin.register(Banner)

banners/apps.py renamed to apps/banners/apps.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@
66
class BannersAppConfig(AppConfig):
77
"""App configuration for the banners app."""
88

9-
name = "banners"
9+
name = "apps.banners"
10+
label = "banners"
File renamed without changes.

0 commit comments

Comments
 (0)