Restructure top level apps

.pre-commit-config.yaml

@@ -2,7 +2,7 @@ repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.15.0
     hooks:
-      - id: ruff
+      - id: ruff-check
         args: [--fix]
       - id: ruff-format
 

apps/__init__.py

@@ -0,0 +1 @@
+"""pythondotorg Django applications package."""

banners/admin.py → apps/banners/admin.py

@@ -2,7 +2,7 @@
 
 from django.contrib import admin
 
-from banners.models import Banner
+from apps.banners.models import Banner
 
 
 @admin.register(Banner)

banners/apps.py → apps/banners/apps.py

@@ -6,4 +6,5 @@
 class BannersAppConfig(AppConfig):
     """App configuration for the banners app."""
 
-    name = "banners"
+    name = "apps.banners"
+    label = "banners"

banners/templatetags/banners.py → apps/banners/templatetags/banners.py

@@ -3,7 +3,7 @@
 from django import template
 from django.template.loader import render_to_string
 
-from banners.models import Banner
+from apps.banners.models import Banner
 
 register = template.Library()
 

blogs/admin.py → apps/blogs/admin.py

@@ -3,7 +3,7 @@
 from django.contrib import admin
 from django.core.management import call_command
 
-from blogs.models import BlogEntry, Feed, FeedAggregate
+from apps.blogs.models import BlogEntry, Feed, FeedAggregate
 
 
 @admin.register(BlogEntry)

blogs/apps.py → apps/blogs/apps.py

@@ -6,4 +6,5 @@
 class BlogsAppConfig(AppConfig):
     """App configuration for the blogs app."""
 
-    name = "blogs"
+    name = "apps.blogs"
+    label = "blogs"

blogs/factories.py → apps/blogs/factories.py

@@ -2,7 +2,7 @@
 
 from django.conf import settings
 
-from blogs.models import Feed
+from apps.blogs.models import Feed
 
 
 def initial_data():

blogs/management/commands/update_blogs.py → apps/blogs/management/commands/update_blogs.py

@@ -1,8 +1,8 @@
 from django.core.management.base import BaseCommand
 from django.utils.timezone import now
 
-from blogs.models import BlogEntry, Feed, RelatedBlog
-from blogs.parser import get_all_entries, update_blog_supernav
+from apps.blogs.models import BlogEntry, Feed, RelatedBlog
+from apps.blogs.parser import get_all_entries, update_blog_supernav
 
 
 class Command(BaseCommand):

blogs/models.py → apps/blogs/models.py

@@ -5,7 +5,7 @@
 from bs4.element import Comment
 from django.db import models
 
-from cms.models import ContentManageable
+from apps.cms.models import ContentManageable
 
 
 def tag_visible(element):

blogs/parser.py → apps/blogs/parser.py

@@ -6,8 +6,8 @@
 from django.conf import settings
 from django.template.loader import render_to_string
 
-from blogs.models import BlogEntry, Feed
-from boxes.models import Box
+from apps.blogs.models import BlogEntry, Feed
+from apps.boxes.models import Box
 
 
 def get_all_entries(feed_url):

blogs/templatetags/blogs.py → apps/blogs/templatetags/blogs.py

@@ -2,7 +2,7 @@
 
 from django import template
 
-from blogs.models import BlogEntry
+from apps.blogs.models import BlogEntry
 
 register = template.Library()
 

blogs/tests/test_models.py → apps/blogs/tests/test_models.py

@@ -1,7 +1,7 @@
 from django.test import TestCase
 from django.utils import timezone
 
-from blogs.models import BlogEntry, Feed
+from apps.blogs.models import BlogEntry, Feed
 
 
 class BlogModelTest(TestCase):

blogs/tests/test_parser.py → apps/blogs/tests/test_parser.py

@@ -1,8 +1,8 @@
 import datetime
 import unittest
 
-from blogs.parser import get_all_entries
-from blogs.tests.utils import get_test_rss_path
+from apps.blogs.parser import get_all_entries
+from apps.blogs.tests.utils import get_test_rss_path
 
 
 class BlogParserTest(unittest.TestCase):

blogs/tests/test_templatetags.py → apps/blogs/tests/test_templatetags.py

@@ -3,9 +3,9 @@
 from django.test import TestCase
 from django.utils.timezone import now
 
-from blogs.models import BlogEntry, Feed, FeedAggregate
-from blogs.templatetags.blogs import get_latest_blog_entries
-from blogs.tests.utils import get_test_rss_path
+from apps.blogs.models import BlogEntry, Feed, FeedAggregate
+from apps.blogs.templatetags.blogs import get_latest_blog_entries
+from apps.blogs.tests.utils import get_test_rss_path
 
 
 class BlogTemplateTagTest(TestCase):

blogs/tests/test_views.py → apps/blogs/tests/test_views.py

@@ -2,8 +2,8 @@
 from django.test import TestCase
 from django.urls import reverse
 
-from blogs.models import BlogEntry, Feed
-from blogs.tests.utils import get_test_rss_path
+from apps.blogs.models import BlogEntry, Feed
+from apps.blogs.tests.utils import get_test_rss_path
 
 
 class BlogViewTest(TestCase):

blogs/urls.py → apps/blogs/urls.py

@@ -2,7 +2,7 @@
 
 from django.urls import path
 
-from blogs import views
+from apps.blogs import views
 
 urlpatterns = [
     path("", views.BlogHome.as_view(), name="blog"),

blogs/views.py → apps/blogs/views.py

@@ -2,7 +2,7 @@
 
 from django.views.generic import TemplateView
 
-from blogs.models import BlogEntry
+from apps.blogs.models import BlogEntry
 
 
 class BlogHome(TemplateView):

boxes/admin.py → apps/boxes/admin.py

@@ -2,8 +2,8 @@
 
 from django.contrib import admin
 
-from boxes.models import Box
-from cms.admin import ContentManageableModelAdmin
+from apps.boxes.models import Box
+from apps.cms.admin import ContentManageableModelAdmin
 
 
 @admin.register(Box)

boxes/apps.py → apps/boxes/apps.py

@@ -6,4 +6,5 @@
 class BoxesAppConfig(AppConfig):
     """App configuration for the boxes app."""
 
-    name = "boxes"
+    name = "apps.boxes"
+    label = "boxes"

boxes/factories.py → apps/boxes/factories.py

@@ -7,8 +7,8 @@
 from django.conf import settings
 from factory.django import DjangoModelFactory
 
-from boxes.models import Box
-from users.factories import UserFactory
+from apps.boxes.models import Box
+from apps.users.factories import UserFactory
 
 
 class BoxFactory(DjangoModelFactory):

boxes/models.py → apps/boxes/models.py

@@ -11,7 +11,7 @@
 from django.db import models
 from markupfield.fields import MarkupField
 
-from cms.models import ContentManageable
+from apps.cms.models import ContentManageable
 
 DEFAULT_MARKUP_TYPE = getattr(settings, "DEFAULT_MARKUP_TYPE", "restructuredtext")
 

boxes/templatetags/boxes.py → apps/boxes/templatetags/boxes.py

@@ -5,7 +5,7 @@
 from django import template
 from django.utils.html import mark_safe
 
-from boxes.models import Box
+from apps.boxes.models import Box
 
 log = logging.getLogger(__name__)
 register = template.Library()

boxes/tests.py → apps/boxes/tests.py

@@ -3,7 +3,7 @@
 from django import template
 from django.test import TestCase, override_settings
 
-from boxes.models import Box
+from apps.boxes.models import Box
 
 logging.disable(logging.CRITICAL)
 
@@ -28,7 +28,7 @@ def test_tag_invalid_label(self):
 
 
 class ViewTests(BaseTestCase):
-    @override_settings(ROOT_URLCONF="boxes.urls")
+    @override_settings(ROOT_URLCONF="apps.boxes.urls")
     def test_box_view(self):
         r = self.client.get("/test/")
         self.assertContains(r, self.box.content.rendered)

boxes/urls.py → apps/boxes/urls.py

@@ -2,7 +2,7 @@
 
 from django.urls import path
 
-from boxes.views import box
+from apps.boxes.views import box
 
 urlpatterns = [
     path("<slug:label>/", box, name="box"),

boxes/views.py → apps/boxes/views.py

@@ -3,7 +3,7 @@
 from django.http import HttpResponse
 from django.shortcuts import get_object_or_404
 
-from boxes.models import Box
+from apps.boxes.models import Box
 
 
 def box(request, label):

cms/apps.py → apps/cms/apps.py

@@ -6,4 +6,5 @@
 class CmsAppConfig(AppConfig):
     """App configuration for the cms app."""
 
-    name = "cms"
+    name = "apps.cms"
+    label = "cms"

cms/tests.py → apps/cms/tests.py

@@ -5,8 +5,8 @@
 from django.template import Context, Template
 from django.test import TestCase
 
-from cms.admin import ContentManageableModelAdmin
-from cms.views import legacy_path
+from apps.cms.admin import ContentManageableModelAdmin
+from apps.cms.views import legacy_path
 
 
 class ContentManageableAdminTests(unittest.TestCase):

codesamples/admin.py → apps/codesamples/admin.py

@@ -2,7 +2,7 @@
 
 from django.contrib import admin
 
-from cms.admin import ContentManageableModelAdmin
-from codesamples.models import CodeSample
+from apps.cms.admin import ContentManageableModelAdmin
+from apps.codesamples.models import CodeSample
 
 admin.site.register(CodeSample, ContentManageableModelAdmin)

codesamples/apps.py → apps/codesamples/apps.py

@@ -6,4 +6,5 @@
 class CodesamplesAppConfig(AppConfig):
     """App configuration for the codesamples app."""
 
-    name = "codesamples"
+    name = "apps.codesamples"
+    label = "codesamples"

codesamples/factories.py → apps/codesamples/factories.py

@@ -5,8 +5,8 @@
 import factory
 from factory.django import DjangoModelFactory
 
-from codesamples.models import CodeSample
-from users.factories import UserFactory
+from apps.codesamples.models import CodeSample
+from apps.users.factories import UserFactory
 
 
 class CodeSampleFactory(DjangoModelFactory):

codesamples/models.py → apps/codesamples/models.py

@@ -5,8 +5,8 @@
 from django.template.defaultfilters import striptags, truncatechars
 from markupfield.fields import MarkupField
 
-from cms.models import ContentManageable
-from codesamples.managers import CodeSampleQuerySet
+from apps.cms.models import ContentManageable
+from apps.codesamples.managers import CodeSampleQuerySet
 
 DEFAULT_MARKUP_TYPE = getattr(settings, "DEFAULT_MARKUP_TYPE", "html")
 

codesamples/tests.py → apps/codesamples/tests.py

@@ -1,6 +1,6 @@
 from django.test import TestCase
 
-from codesamples.models import CodeSample
+from apps.codesamples.models import CodeSample
 
 
 class CodeSampleModelTests(TestCase):

community/admin.py → apps/community/admin.py

@@ -2,8 +2,8 @@
 
 from django.contrib import admin
 
-from cms.admin import ContentManageableModelAdmin, ContentManageableStackedInline
-from community.models import Link, Photo, Post, Video
+from apps.cms.admin import ContentManageableModelAdmin, ContentManageableStackedInline
+from apps.community.models import Link, Photo, Post, Video
 
 
 class LinkInline(ContentManageableStackedInline):

community/apps.py → apps/community/apps.py

@@ -6,4 +6,5 @@
 class CommunityAppConfig(AppConfig):
     """App configuration for the community app."""
 
-    name = "community"
+    name = "apps.community"
+    label = "community"

community/models.py → apps/community/models.py

@@ -6,8 +6,8 @@
 from django.utils.translation import gettext_lazy as _
 from markupfield.fields import MarkupField
 
-from cms.models import ContentManageable
-from community.managers import PostQuerySet
+from apps.cms.models import ContentManageable
+from apps.community.managers import PostQuerySet
 
 DEFAULT_MARKUP_TYPE = "html"
 

community/tests/test_managers.py → apps/community/tests/test_managers.py

@@ -1,6 +1,6 @@
 from django.test import TestCase
 
-from community.models import Post
+from apps.community.models import Post
 
 
 class CommunityManagersTest(TestCase):

community/tests/test_models.py → apps/community/tests/test_models.py

@@ -1,6 +1,6 @@
 from django.test import TestCase
 
-from community.models import Post
+from apps.community.models import Post
 
 
 class ModelTestCase(TestCase):

community/tests/test_views.py → apps/community/tests/test_views.py

@@ -1,4 +1,4 @@
-from community.models import Post
+from apps.community.models import Post
 from pydotorg.tests.test_classes import TemplateTestCase
 
 

community/urls.py → apps/community/urls.py

@@ -2,7 +2,7 @@
 
 from django.urls import path
 
-from community import views
+from apps.community import views
 
 app_name = "community"
 urlpatterns = [

community/views.py → apps/community/views.py

@@ -2,7 +2,7 @@
 
 from django.views.generic import DetailView, ListView
 
-from community.models import Post
+from apps.community.models import Post
 
 
 class PostList(ListView):

companies/admin.py → apps/companies/admin.py

@@ -2,8 +2,8 @@
 
 from django.contrib import admin
 
-from cms.admin import NameSlugAdmin
-from companies.models import Company
+from apps.cms.admin import NameSlugAdmin
+from apps.companies.models import Company
 
 
 @admin.register(Company)

companies/apps.py → apps/companies/apps.py

@@ -6,4 +6,5 @@
 class CompaniesAppConfig(AppConfig):
     """App configuration for the companies app."""
 
-    name = "companies"
+    name = "apps.companies"
+    label = "companies"