Sep 17, 2024 · Sep 19, 2024 · Sep 19, 2024 · Sep 19, 2024 · Sep 19, 2024 · Sep 19, 2024
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
          cache-name: pythondotorg-cache-pip
        with:
          path: ~/.cache/pip
          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('requirements.txt', '*-requirements.txt') }}
          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('requirements/requirements.txt', 'requirements/*-requirements.txt') }}
          restore-keys: |
            ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-
            ${{ runner.os }}-${{ github.job }}-
            ${{ runner.os }}-
      - name: Install Python dependencies
        run: |
          pip install -U pip setuptools wheel
          pip install -r dev-requirements.txt
          pip install -rrequirements/dev-requirements.txt
      - name: Check for ungenerated database migrations
        run: |
          python manage.py makemigrations --check --dry-run
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
 cache-name:pythondotorg-cache-pip
 with:
 path:~/.cache/pip
 key:${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('requirements.txt', '*-requirements.txt') }}
 key:${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('requirements/requirements.txt', 'requirements/*-requirements.txt') }}
 restore-keys:|
            ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-
            ${{ runner.os }}-${{ github.job }}-
            ${{ runner.os }}-
      -name:Install Python dependencies
 run:|
          pip install -U pip setuptools wheel
          pip install -r requirements.txt -r prod-requirements.txt
          pip install -r requirements/requirements.txt -rrequirements/prod-requirements.txt
      -name:Run Tests
 run:|
          DJANGO_SETTINGS_MODULE=pydotorg.settings.static python manage.py collectstatic --noinput
diff --git a/.gitignore b/.gitignore

 .sass-cache/
 docs/build
 media/*
 app/media/*
 static-root/
 static/stylesheets/mq.css
 static/stylesheets/no-mq.css
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
    python: "3"

  commands:
      - python -m pip install -r docs-requirements.txt
      - python -m pip install -rrequirements/docs-requirements.txt
      - make -C docs html JOBS=$(nproc) BUILDDIR=_readthedocs
      - mv docs/_readthedocs _readthedocs
diff --git a/Dockerfile b/Dockerfile
 RUN mkdir /code
 WORKDIR /code

 COPY dev-requirements.txt /code/
 COPY base-requirements.txt /code/
 COPY prod-requirements.txt /code/
 COPY requirements.txt /code/
 COPYrequirements/dev-requirements.txt /code/
 COPYrequirements/base-requirements.txt /code/
 COPYrequirements/prod-requirements.txt /code/
 COPY requirements/requirements.txt /code/

 RUN pip --no-cache-dir --disable-pip-version-check install --upgrade pip setuptools wheel

diff --git a/Dockerfile.cabotage b/Dockerfile.cabotage
 RUN mkdir /code
 WORKDIR /code

 COPY dev-requirements.txt /code/
 COPY base-requirements.txt /code/
 COPY prod-requirements.txt /code/
 COPY requirements.txt /code/
 COPYrequirements/dev-requirements.txt /code/
 COPYrequirements/base-requirements.txt /code/
 COPYrequirements/prod-requirements.txt /code/
 COPY requirements/requirements.txt /code/

 RUN pip --no-cache-dir --disable-pip-version-check install --upgrade pip setuptools wheel

        install \
        -r requirements.txt -r prod-requirements.txt
 COPY . /code/
 RUN DJANGO_SETTINGS_MODULE=pydotorg.settings.static python manage.py collectstatic --noinput
 RUN DJANGO_SETTINGS_MODULE=pydotorg.settings.static pythonapp/manage.py collectstatic --noinput
diff --git a/Makefile b/Makefile
 @echo
 @exit 1

 .state/docker-build-web: Dockerfile dev-requirements.txt base-requirements.txt
 .state/docker-build-web: Dockerfilerequirements/dev-requirements.txtrequirements/base-requirements.txt
 # Build web container for this project
 docker compose build --force-rm web


 .state/db-initialized: .state/docker-build-web .state/db-migrated
 # Load all fixtures
 docker compose run --rm web ./manage.py loaddata fixtures/*.json
 docker compose run --rm web ./app/manage.py loaddata fixtures/*.json

 # Mark the state so we don't rebuild this needlessly.
 mkdir -p .state && touch .state/db-initialized

 migrations: .state/db-initialized
 # Run Django makemigrations
 docker compose run --rm web ./manage.py makemigrations
 docker compose run --rm web ./app/manage.py makemigrations

 migrate: .state/docker-build-web
 # Run Django migrate
 docker compose run --rm web ./manage.py migrate
 docker compose run --rm web ./app/manage.py migrate

 manage: .state/db-initialized
 # Run Django manage to accept arbitrary arguments
 docker compose run --rm web ./manage.py $(filter-out $@,$(MAKECMDGOALS))
 docker compose run --rm web ./app/manage.py $(filter-out $@,$(MAKECMDGOALS))

 shell: .state/db-initialized
 docker compose run --rm web ./manage.py shell
 docker compose run --rm web ./app/manage.py shell

 clean:
 docker compose down -v
 rm -f .state/docker-build-web .state/db-initialized .state/db-migrated

 test: .state/db-initialized
 docker compose run --rm web ./manage.py test
 docker compose run --rm web ./app/manage.py test

 docker_shell: .state/db-initialized
 docker compose run --rm web /bin/bash
diff --git a/Procfile b/Procfile
 release: python manage.py migrate --noinput
 release: pythonapp/manage.py migrate --noinput
 web: bin/start-nginx gunicorn -c gunicorn.conf pydotorg.wsgi
 worker: celery -A pydotorg worker -l INFO
 worker: celery -Aapp.pydotorg worker -l INFO
 worker-beat: celery -A pydotorg beat -l INFO --scheduler django_celery_beat.schedulers:DatabaseScheduler
diff --git a/banners/__init__.py → app/__init__.py b/banners/__init__.py → app/__init__.py
diff --git a/banners/migrations/__init__.py → app/banners/__init__.py b/banners/migrations/__init__.py → app/banners/__init__.py
diff --git a/banners/admin.py → app/banners/admin.py b/banners/admin.py → app/banners/admin.py
 from django.contrib import admin

 from banners.models import Banner
 fromapp.banners.models import Banner


 @admin.register(Banner)
diff --git a/banners/apps.py → app/banners/apps.py b/banners/apps.py → app/banners/apps.py

 class BannersAppConfig(AppConfig):

    name = 'banners'
    name = 'app.banners'
diff --git a/banners/migrations/0001_initial.py → app/banners/migrations/0001_initial.py b/banners/migrations/0001_initial.py → app/banners/migrations/0001_initial.py
diff --git a/banners/templatetags/__init__.py → app/banners/migrations/__init__.py b/banners/templatetags/__init__.py → app/banners/migrations/__init__.py
diff --git a/banners/models.py → app/banners/models.py b/banners/models.py → app/banners/models.py
diff --git a/templates/banners/banner.html → app/banners/templates/banner.html b/templates/banners/banner.html → app/banners/templates/banner.html
diff --git a/blogs/__init__.py → app/banners/templatetags/__init__.py b/blogs/__init__.py → app/banners/templatetags/__init__.py
diff --git a/banners/templatetags/banners.py → app/banners/templatetags/banners.py b/banners/templatetags/banners.py → app/banners/templatetags/banners.py
 from django import template
 from django.template.loader import render_to_string

 from banners.models import Banner
 fromapp.banners.models import Banner

 register = template.Library()

diff --git a/bin/pre_compile → app/bin/pre_compile b/bin/pre_compile → app/bin/pre_compile
diff --git a/bin/start-nginx → app/bin/start-nginx b/bin/start-nginx → app/bin/start-nginx
diff --git a/blogs/management/__init__.py → app/blogs/__init__.py b/blogs/management/__init__.py → app/blogs/__init__.py
diff --git a/blogs/admin.py → app/blogs/admin.py b/blogs/admin.py → app/blogs/admin.py
 from django.contrib import admin
 from django.core.management import call_command

 from .models import BlogEntry, Feed, FeedAggregate
 fromapp.blogs.models import BlogEntry, Feed, FeedAggregate


 @admin.register(BlogEntry)
diff --git a/blogs/apps.py → app/blogs/apps.py b/blogs/apps.py → app/blogs/apps.py

 class BlogsAppConfig(AppConfig):

    name = 'blogs'
    name = 'app.blogs'
diff --git a/blogs/factories.py → app/blogs/factories.py b/blogs/factories.py → app/blogs/factories.py
 from django.conf import settings

 from .models import Feed
 fromapp.blogs.models import Feed


 def initial_data():
diff --git a/blogs/management/commands/__init__.py → app/blogs/management/__init__.py b/blogs/management/commands/__init__.py → app/blogs/management/__init__.py
diff --git a/blogs/migrations/__init__.py → app/blogs/management/commands/__init__.py b/blogs/migrations/__init__.py → app/blogs/management/commands/__init__.py
diff --git a/blogs/management/commands/update_blogs.py → ...blogs/management/commands/update_blogs.py b/blogs/management/commands/update_blogs.py → ...blogs/management/commands/update_blogs.py
 from django.core.management.base import BaseCommand
 from django.utils.timezone import now

 from...models import BlogEntry, RelatedBlog, Feed
 from...parser import get_all_entries, update_blog_supernav
 fromapp.blogs..models import BlogEntry, RelatedBlog, Feed
 fromapp.blogs..parser import get_all_entries, update_blog_supernav


 class Command(BaseCommand):
diff --git a/blogs/migrations/0001_initial.py → app/blogs/migrations/0001_initial.py b/blogs/migrations/0001_initial.py → app/blogs/migrations/0001_initial.py
diff --git a/...2_remove_translations_and_contributors.py → ...2_remove_translations_and_contributors.py b/...2_remove_translations_and_contributors.py → ...2_remove_translations_and_contributors.py
diff --git a/...003_alter_relatedblog_creator_and_more.py → ...003_alter_relatedblog_creator_and_more.py b/...003_alter_relatedblog_creator_and_more.py → ...003_alter_relatedblog_creator_and_more.py
diff --git a/blogs/templatetags/__init__.py → app/blogs/migrations/__init__.py b/blogs/templatetags/__init__.py → app/blogs/migrations/__init__.py
diff --git a/blogs/models.py → app/blogs/models.py b/blogs/models.py → app/blogs/models.py

 from django.db import models

 from cms.models import ContentManageable
 fromapp.cms.models import ContentManageable


 def tag_visible(element):
diff --git a/blogs/parser.py → app/blogs/parser.py b/blogs/parser.py → app/blogs/parser.py
 from django.template.loader import render_to_string
 from django.utils.timezone import make_aware

 from boxes.models import Box
 from .models import BlogEntry, Feed
 fromapp.boxes.models import Box
 fromapp.blogs.models import BlogEntry, Feed


 def get_all_entries(feed_url):
diff --git a/templates/blogs/index.html → app/blogs/templates/index.html b/templates/blogs/index.html → app/blogs/templates/index.html
diff --git a/templates/blogs/supernav.html → app/blogs/templates/supernav.html b/templates/blogs/supernav.html → app/blogs/templates/supernav.html
diff --git a/blogs/tests/__init__.py → app/blogs/templatetags/__init__.py b/blogs/tests/__init__.py → app/blogs/templatetags/__init__.py
diff --git a/blogs/templatetags/blogs.py → app/blogs/templatetags/blogs.py b/blogs/templatetags/blogs.py → app/blogs/templatetags/blogs.py
 from django import template

 from..models import BlogEntry
 fromapp.blogs.models import BlogEntry

 register = template.Library()

diff --git a/boxes/__init__.py → app/blogs/tests/__init__.py b/boxes/__init__.py → app/blogs/tests/__init__.py
Original file line number	Diff line number	Diff line change
Expand Up		@@ -38,15 +38,15 @@ jobs:
		cache-name: pythondotorg-cache-pip
		with:
		path: ~/.cache/pip
		key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('requirements.txt', '*-requirements.txt') }}
		key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('requirements/requirements.txt', 'requirements/*-requirements.txt') }}
		restore-keys: \|
		${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-
		${{ runner.os }}-${{ github.job }}-
		${{ runner.os }}-
		- name: Install Python dependencies
		run: \|
		pip install -U pip setuptools wheel
		pip install -r dev-requirements.txt
		pip install -rrequirements/dev-requirements.txt
		- name: Check for ungenerated database migrations
		run: \|
		python manage.py makemigrations --check --dry-run
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,15 +15,15 @@ jobs:
		cache-name:pythondotorg-cache-pip
		with:
		path:~/.cache/pip
		key:${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('requirements.txt', '*-requirements.txt') }}
		key:${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('requirements/requirements.txt', 'requirements/*-requirements.txt') }}
		restore-keys:\|
		${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-
		${{ runner.os }}-${{ github.job }}-
		${{ runner.os }}-
		-name:Install Python dependencies
		run:\|
		pip install -U pip setuptools wheel
		pip install -r requirements.txt -r prod-requirements.txt
		pip install -r requirements/requirements.txt -rrequirements/prod-requirements.txt
		-name:Run Tests
		run:\|
		DJANGO_SETTINGS_MODULE=pydotorg.settings.static python manage.py collectstatic --noinput
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,7 +11,7 @@

		.sass-cache/
		docs/build
		media/*
		app/media/*
		static-root/
		static/stylesheets/mq.css
		static/stylesheets/no-mq.css
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,6 +10,6 @@ build:
		python: "3"

		commands:
		- python -m pip install -r docs-requirements.txt
		- python -m pip install -rrequirements/docs-requirements.txt
		- make -C docs html JOBS=$(nproc) BUILDDIR=_readthedocs
		- mv docs/_readthedocs _readthedocs
Original file line number	Diff line number	Diff line change
Expand Up		@@ -32,10 +32,10 @@ RUN case $(uname -m) in \
		RUN mkdir /code
		WORKDIR /code

		COPY dev-requirements.txt /code/
		COPY base-requirements.txt /code/
		COPY prod-requirements.txt /code/
		COPY requirements.txt /code/
		COPYrequirements/dev-requirements.txt /code/
		COPYrequirements/base-requirements.txt /code/
		COPYrequirements/prod-requirements.txt /code/
		COPY requirements/requirements.txt /code/

		RUN pip --no-cache-dir --disable-pip-version-check install --upgrade pip setuptools wheel

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -33,10 +33,10 @@ RUN case $(uname -m) in \
		RUN mkdir /code
		WORKDIR /code

		COPY dev-requirements.txt /code/
		COPY base-requirements.txt /code/
		COPY prod-requirements.txt /code/
		COPY requirements.txt /code/
		COPYrequirements/dev-requirements.txt /code/
		COPYrequirements/base-requirements.txt /code/
		COPYrequirements/prod-requirements.txt /code/
		COPY requirements/requirements.txt /code/

		RUN pip --no-cache-dir --disable-pip-version-check install --upgrade pip setuptools wheel

Expand All		@@ -46,4 +46,4 @@ RUN --mount=type=cache,target=/root/.cache/pip \
		install \
		-r requirements.txt -r prod-requirements.txt
		COPY . /code/
		RUN DJANGO_SETTINGS_MODULE=pydotorg.settings.static python manage.py collectstatic --noinput
		RUN DJANGO_SETTINGS_MODULE=pydotorg.settings.static pythonapp/manage.py collectstatic --noinput
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,7 +8,7 @@ default:
		@echo
		@exit 1

		.state/docker-build-web: Dockerfile dev-requirements.txt base-requirements.txt
		.state/docker-build-web: Dockerfilerequirements/dev-requirements.txtrequirements/base-requirements.txt
		# Build web container for this project
		docker compose build --force-rm web

Expand All		@@ -24,7 +24,7 @@ default:

		.state/db-initialized: .state/docker-build-web .state/db-migrated
		# Load all fixtures
		docker compose run --rm web ./manage.py loaddata fixtures/*.json
		docker compose run --rm web ./app/manage.py loaddata fixtures/*.json

		# Mark the state so we don't rebuild this needlessly.
		mkdir -p .state && touch .state/db-initialized
Expand All		@@ -34,25 +34,25 @@ serve: .state/db-initialized

		migrations: .state/db-initialized
		# Run Django makemigrations
		docker compose run --rm web ./manage.py makemigrations
		docker compose run --rm web ./app/manage.py makemigrations

		migrate: .state/docker-build-web
		# Run Django migrate
		docker compose run --rm web ./manage.py migrate
		docker compose run --rm web ./app/manage.py migrate

		manage: .state/db-initialized
		# Run Django manage to accept arbitrary arguments
		docker compose run --rm web ./manage.py $(filter-out $@,$(MAKECMDGOALS))
		docker compose run --rm web ./app/manage.py $(filter-out $@,$(MAKECMDGOALS))

		shell: .state/db-initialized
		docker compose run --rm web ./manage.py shell
		docker compose run --rm web ./app/manage.py shell

		clean:
		docker compose down -v
		rm -f .state/docker-build-web .state/db-initialized .state/db-migrated

		test: .state/db-initialized
		docker compose run --rm web ./manage.py test
		docker compose run --rm web ./app/manage.py test

		docker_shell: .state/db-initialized
		docker compose run --rm web /bin/bash
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,4 @@
		release: python manage.py migrate --noinput
		release: pythonapp/manage.py migrate --noinput
		web: bin/start-nginx gunicorn -c gunicorn.conf pydotorg.wsgi
		worker: celery -A pydotorg worker -l INFO
		worker: celery -Aapp.pydotorg worker -l INFO
		worker-beat: celery -A pydotorg beat -l INFO --scheduler django_celery_beat.schedulers:DatabaseScheduler
Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		from django.contrib import admin

		from banners.models import Banner
		fromapp.banners.models import Banner


		@admin.register(Banner)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,4 +3,4 @@

		class BannersAppConfig(AppConfig):

		name = 'banners'
		name = 'app.banners'