diff --git a/docs/faq/install.txt b/docs/faq/install.txt index e54336882b..1618d40c8e 100644 --- a/docs/faq/install.txt +++ b/docs/faq/install.txt @@ -50,8 +50,10 @@ What Python version can I use with Django? ============== =============== Django version Python versions ============== =============== -2.2 3.5, 3.6, 3.7, 3.8 (added in 2.2.8) -3.0, 3.1, 3.2 3.6, 3.7, 3.8 +2.2 3.5, 3.6, 3.7, 3.8 (added in 2.2.8), 3.9 (added in 2.2.17) +3.0 3.6, 3.7, 3.8, 3.9 (added in 3.0.11) +3.1 3.6, 3.7, 3.8, 3.9 (added in 3.1.3) +3.2 3.6, 3.7, 3.8, 3.9 ============== =============== For each version of Python, only the latest micro release (A.B.C) is officially diff --git a/docs/releases/2.2.17.txt b/docs/releases/2.2.17.txt new file mode 100644 index 0000000000..d574de6574 --- /dev/null +++ b/docs/releases/2.2.17.txt @@ -0,0 +1,7 @@ +=========================== +Django 2.2.17 release notes +=========================== + +*Expected November 2, 2020* + +Django 2.2.17 adds compatibility with Python 3.9. diff --git a/docs/releases/2.2.txt b/docs/releases/2.2.txt index 3f21c55b18..315c013771 100644 --- a/docs/releases/2.2.txt +++ b/docs/releases/2.2.txt @@ -23,9 +23,9 @@ end in April 2020. Python compatibility ==================== -Django 2.2 supports Python 3.5, 3.6, 3.7, and 3.8 (as of 2.2.8). We -**highly recommend** and only officially support the latest release of each -series. +Django 2.2 supports Python 3.5, 3.6, 3.7, 3.8 (as of 2.2.8), and 3.9 (as of +2.2.17). We **highly recommend** and only officially support the latest release +of each series. .. _whats-new-2.2: diff --git a/docs/releases/3.0.11.txt b/docs/releases/3.0.11.txt new file mode 100644 index 0000000000..a5009feb51 --- /dev/null +++ b/docs/releases/3.0.11.txt @@ -0,0 +1,7 @@ +=========================== +Django 3.0.11 release notes +=========================== + +*Expected November 2, 2020* + +Django 3.0.11 adds compatibility with Python 3.9. diff --git a/docs/releases/3.0.txt b/docs/releases/3.0.txt index 284782d80c..1c39980a91 100644 --- a/docs/releases/3.0.txt +++ b/docs/releases/3.0.txt @@ -19,8 +19,8 @@ project. Python compatibility ==================== -Django 3.0 supports Python 3.6, 3.7, and 3.8. We **highly recommend** and only -officially support the latest release of each series. +Django 3.0 supports Python 3.6, 3.7, 3.8, and 3.9 (as of 3.0.11). We **highly +recommend** and only officially support the latest release of each series. The Django 2.2.x series is the last to support Python 3.5. diff --git a/docs/releases/3.1.3.txt b/docs/releases/3.1.3.txt index e1665c2ee5..4236efce1b 100644 --- a/docs/releases/3.1.3.txt +++ b/docs/releases/3.1.3.txt @@ -4,7 +4,8 @@ Django 3.1.3 release notes *Expected November 2, 2020* -Django 3.1.3 fixes several bugs in 3.1.2. +Django 3.1.3 fixes several bugs in 3.1.2 and adds compatibility with Python +3.9. Bugfixes ======== diff --git a/docs/releases/3.1.txt b/docs/releases/3.1.txt index b723d0c566..730d0b682a 100644 --- a/docs/releases/3.1.txt +++ b/docs/releases/3.1.txt @@ -19,8 +19,8 @@ project. Python compatibility ==================== -Django 3.1 supports Python 3.6, 3.7, and 3.8. We **highly recommend** and only -officially support the latest release of each series. +Django 3.1 supports Python 3.6, 3.7, 3.8, and 3.9 (as of 3.1.3). We **highly +recommend** and only officially support the latest release of each series. .. _whats-new-3.1: diff --git a/docs/releases/3.2.txt b/docs/releases/3.2.txt index ab1d4dfb9a..5ab05a1dba 100644 --- a/docs/releases/3.2.txt +++ b/docs/releases/3.2.txt @@ -23,8 +23,8 @@ end in April 2022. Python compatibility ==================== -Django 3.2 supports Python 3.6, 3.7, and 3.8. We **highly recommend** and only -officially support the latest release of each series. +Django 3.2 supports Python 3.6, 3.7, 3.8, and 3.9. We **highly recommend** and +only officially support the latest release of each series. .. _whats-new-3.2: diff --git a/docs/releases/index.txt b/docs/releases/index.txt index 5248be5f64..c9fd871ae5 100644 --- a/docs/releases/index.txt +++ b/docs/releases/index.txt @@ -42,6 +42,7 @@ versions of the documentation contain the release notes for any later releases. .. toctree:: :maxdepth: 1 + 3.0.11 3.0.10 3.0.9 3.0.8 @@ -59,6 +60,7 @@ versions of the documentation contain the release notes for any later releases. .. toctree:: :maxdepth: 1 + 2.2.17 2.2.16 2.2.15 2.2.14 diff --git a/setup.cfg b/setup.cfg index d5a202851b..43ba86120b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -20,6 +20,7 @@ classifiers = Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3.9 Topic :: Internet :: WWW/HTTP Topic :: Internet :: WWW/HTTP :: Dynamic Content Topic :: Internet :: WWW/HTTP :: WSGI diff --git a/tox.ini b/tox.ini index 61081a3744..1b89a965f1 100644 --- a/tox.ini +++ b/tox.ini @@ -22,7 +22,7 @@ passenv = DJANGO_SETTINGS_MODULE PYTHONPATH HOME DISPLAY OBJC_DISABLE_INITIALIZE setenv = PYTHONDONTWRITEBYTECODE=1 deps = - py{3,36,37,38}: -rtests/requirements/py3.txt + py{3,36,37,38,39}: -rtests/requirements/py3.txt postgres: -rtests/requirements/postgres.txt mysql: -rtests/requirements/mysql.txt oracle: -rtests/requirements/oracle.txt