Merge branch 'python:main' into main

Author: alvindera97

.github/ISSUE_TEMPLATE/BUG.yml

@@ -1,13 +1,13 @@
 name: "Bug Report"
-description: Report a bug with pyton.org website to help us improve
+description: Report a bug with python.org website to help us improve
 title: "Bug: <title>"
 labels: ["bug", "Triage Required"]
 
 body:
   - type: markdown
     attributes:
       value: |
-        This is the repository and issue tracker for the https://www.pyton.org website.
+        This is the repository and issue tracker for the https://www.python.org website.
 
         If you're looking to file an issue with CPython itself, please click here: [CPython Issues](https://github.com/python/cpython/issues/new/choose).
 

.github/ISSUE_TEMPLATE/DOCS.yml

@@ -7,7 +7,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        This is the repository and issue tracker for the https://www.pyton.org website.
+        This is the repository and issue tracker for the https://www.python.org website.
 
         If you're looking to file an issue with CPython itself, please click here: [CPython Issues](https://github.com/python/cpython/issues/new/choose).
 

.github/ISSUE_TEMPLATE/REQUEST.yml

@@ -1,13 +1,13 @@
 name: "Feature Request"
-description: Suggest an idea for www.pyton.org
+description: Suggest an idea for www.python.org
 title: "Enhancement: <title>"
 labels: ["enhancement"]
 
 body:
   - type: markdown
     attributes:
       value: |
-        This is the repository and issue tracker for the https://www.pyton.org website.
+        This is the repository and issue tracker for the https://www.python.org website.
 
         If you're looking to file an issue with CPython itself, please click here: [CPython Issues](https://github.com/python/cpython/issues/new/choose).
 

.github/workflows/deployminder.yml

@@ -1,12 +1,11 @@
-default: 
+help:
 	@echo "Call a specific subcommand:"
 	@echo
-	@$(MAKE) -pRrq -f $(lastword $(MAKEFILE_LIST)) : 2>/dev/null\
-        | awk -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}'\
-        | sort\
-        | grep -E -v -e '^[^[:alnum:]]' -e '^$@$$'
+	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) \
+		| awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 	@echo
-	@exit 1
+
+default: help
 
 .state/docker-build-web: Dockerfile dev-requirements.txt base-requirements.txt
 	# Build web container for this project
@@ -29,30 +28,29 @@ default:
 	# Mark the state so we don't rebuild this needlessly.
 	mkdir -p .state && touch .state/db-initialized
 
-serve: .state/db-initialized
+serve: .state/db-initialized ## Start the application
 	docker compose up --remove-orphans
 
-migrations: .state/db-initialized 
-	# Run Django makemigrations
+migrations: .state/db-initialized ## Generate migrations from models
 	docker compose run --rm web ./manage.py makemigrations  
 
-migrate: .state/docker-build-web
-	# Run Django migrate
+migrate: .state/docker-build-web ## Run Django migrate
 	docker compose run --rm web ./manage.py migrate 
 
-manage: .state/db-initialized
-	# Run Django manage to accept arbitrary arguments
+manage: .state/db-initialized ## Run Django manage to accept arbitrary arguments
 	docker compose run --rm web ./manage.py $(filter-out $@,$(MAKECMDGOALS))
 
-shell: .state/db-initialized 
+shell: .state/db-initialized ## Open Django interactive shell
 	docker compose run --rm web ./manage.py shell
 
-clean:
+clean: ## Clean up the environment
 	docker compose down -v
 	rm -f .state/docker-build-web .state/db-initialized .state/db-migrated 
 
-test: .state/db-initialized
+test: .state/db-initialized ## Run tests
 	docker compose run --rm web ./manage.py test
 
-docker_shell: .state/db-initialized
+docker_shell: .state/db-initialized ## Open a bash shell in the web container
 	docker compose run --rm web /bin/bash
+
+.PHONY: help serve migrations migrate manage shell clean test docker_shell

Makefile

@@ -4,10 +4,10 @@ django-sitetree==1.18.0  # >=1.17.1 is (?) first version that supports Django 4.
 django-apptemplates==1.5
 django-admin-interface==0.28.9
 django-translation-aliases==0.1.0
-Django==4.2.16
+Django==4.2.22
 docutils==0.21.2
 Markdown==3.7
-cmarkgfm==0.6.0
+cmarkgfm==2024.11.20
 Pillow==10.4.0
 psycopg2-binary==2.9.9
 python3-openid==3.2.0

base-requirements.txt

@@ -48,10 +48,12 @@ def update_blog_supernav():
         pass
     else:
         rendered_box = _render_blog_supernav(latest_entry)
-        box, _ = Box.objects.update_or_create(
+        box, created = Box.objects.update_or_create(
             label='supernav-python-blog',
             defaults={
                 'content': rendered_box,
                 'content_markup_type': 'html',
             }
         )
+        if not created:
+            box.save()

blogs/parser.py

@@ -122,11 +122,12 @@ def initial_data():
             <code>
             <span class=\"comment\"># Write Fibonacci series up to n</span>
             >>> def fib(n):
-            >>>     a, b = 0, 1
-            >>>     while a &lt; n:
-            >>>         print(a, end=' ')
-            >>>         a, b = b, a+b
-            >>>     print()
+            ...     a, b = 0, 1
+            ...     while a &lt; n:
+            ...         print(a, end=' ')
+            ...         a, b = b, a+b
+            ...     print()
+            ...
             >>> fib(1000)
             <span class=\"output\">0 1 1 2 3 5 8 13 21 34 55 89 144 233 377 610</span>
             </code>

codesamples/factories.py

@@ -32,8 +32,6 @@ Indices and tables
 ==================
 
 * :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
 
 .. _python.org: https://www.python.org
 .. _pydotorg-www: https://mail.python.org/mailman/listinfo/pydotorg-www

docs/source/index.rst

@@ -23,12 +23,18 @@ def python2(self):
     def python3(self):
         return self.filter(version=3, is_published=True)
 
+    def pymanager(self):
+        return self.filter(version=100, is_published=True)
+
     def latest_python2(self):
         return self.python2().filter(is_latest=True)
 
     def latest_python3(self):
         return self.python3().filter(is_latest=True)
 
+    def latest_pymanager(self):
+        return self.pymanager().filter(is_latest=True)
+
     def pre_release(self):
         return self.filter(pre_release=True)
 
@@ -50,3 +56,10 @@ def latest_python3(self):
             return qs[0]
         else:
             return None
+
+    def latest_pymanager(self):
+        qs = self.get_queryset().latest_pymanager()
+        if qs:
+            return qs[0]
+        else:
+            return None