summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMariusz Felisiak <felisiak.mariusz@gmail.com>2023-11-18 15:56:29 +0100
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2023-11-19 16:33:01 +0100
commitf721fb937c6e41fab3cc1451f7170e8d9ab4940d (patch)
treea38da5f34dbb24488ef067b2cfe88b77f389ec68
parentc342b58243fac5019290bb328d68093462066535 (diff)
[5.0.x] Refs #34118 -- Doc'd Python 3.12 compatibility in Django 4.2.x.
Backport of ecfea054ee2b8ddfa027459ff8b6aecba05facf7 from main
-rw-r--r--docs/faq/install.txt2
-rw-r--r--docs/howto/windows.txt4
-rw-r--r--docs/intro/reusable-apps.txt1
-rw-r--r--docs/releases/4.2.8.txt3
-rw-r--r--docs/releases/4.2.txt5
5 files changed, 9 insertions, 6 deletions
diff --git a/docs/faq/install.txt b/docs/faq/install.txt
index 621b314734..388350b2d8 100644
--- a/docs/faq/install.txt
+++ b/docs/faq/install.txt
@@ -53,7 +53,7 @@ Django version Python versions
3.2 3.6, 3.7, 3.8, 3.9, 3.10 (added in 3.2.9)
4.0 3.8, 3.9, 3.10
4.1 3.8, 3.9, 3.10, 3.11 (added in 4.1.3)
-4.2 3.8, 3.9, 3.10, 3.11
+4.2 3.8, 3.9, 3.10, 3.11, 3.12 (added in 4.2.8)
5.0 3.10, 3.11, 3.12
============== ===============
diff --git a/docs/howto/windows.txt b/docs/howto/windows.txt
index d0d2b9a119..5dd40915d9 100644
--- a/docs/howto/windows.txt
+++ b/docs/howto/windows.txt
@@ -2,7 +2,7 @@
How to install Django on Windows
================================
-This document will guide you through installing Python 3.11 and Django on
+This document will guide you through installing Python 3.12 and Django on
Windows. It also provides instructions for setting up a virtual environment,
which makes it easier to work on Python projects. This is meant as a beginner's
guide for users working on Django projects and does not reflect how Django
@@ -18,7 +18,7 @@ Install Python
==============
Django is a Python web framework, thus requiring Python to be installed on your
-machine. At the time of writing, Python 3.11 is the latest version.
+machine. At the time of writing, Python 3.12 is the latest version.
To install Python on your machine go to https://www.python.org/downloads/. The
website should offer you a download button for the latest Python version.
diff --git a/docs/intro/reusable-apps.txt b/docs/intro/reusable-apps.txt
index 967c3c697d..19d9063edd 100644
--- a/docs/intro/reusable-apps.txt
+++ b/docs/intro/reusable-apps.txt
@@ -221,6 +221,7 @@ this. For a small app like polls, this process isn't too difficult.
Programming Language :: Python :: 3 :: Only
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
+ Programming Language :: Python :: 3.12
Topic :: Internet :: WWW/HTTP
Topic :: Internet :: WWW/HTTP :: Dynamic Content
diff --git a/docs/releases/4.2.8.txt b/docs/releases/4.2.8.txt
index 2229324362..5c2d089b7f 100644
--- a/docs/releases/4.2.8.txt
+++ b/docs/releases/4.2.8.txt
@@ -4,7 +4,8 @@ Django 4.2.8 release notes
*Expected December 4, 2023*
-Django 4.2.8 fixes several bugs in 4.2.7.
+Django 4.2.8 fixes several bugs in 4.2.7 and adds compatibility with Python
+3.12.
Bugfixes
========
diff --git a/docs/releases/4.2.txt b/docs/releases/4.2.txt
index aeda95d7af..59f144a15c 100644
--- a/docs/releases/4.2.txt
+++ b/docs/releases/4.2.txt
@@ -23,8 +23,9 @@ end in April 2024.
Python compatibility
====================
-Django 4.2 supports Python 3.8, 3.9, 3.10, and 3.11. We **highly recommend**
-and only officially support the latest release of each series.
+Django 4.2 supports Python 3.8, 3.9, 3.10, 3.11, and 3.12 (as of 4.2.8). We
+**highly recommend** and only officially support the latest release of each
+series.
.. _whats-new-4.2: