From ad6faa617df983e361cfaadee1cc177068bcd548 Mon Sep 17 00:00:00 2001
From: Nix Siow <nixsiow@hotmail.com>
Date: Thu, 21 Mar 2024 23:00:32 +1000
Subject: [PATCH] Add PostgreSQL 16, remove Postgres 10 and 11 (#4935)

Add support for PostgreSQL 16 and remove support for version 10 & 11
---
 README.md                             | 13 ++++++-------
 cookiecutter.json                     |  2 +-
 docs/project-generation-options.rst   | 11 +++++------
 tests/test_cookiecutter_generation.py |  3 +--
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 3141aed89..995303b42 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ _These features can be enabled during initial project setup._
 ## Constraints
 
 - Only maintained 3rd party libraries are used.
-- Uses PostgreSQL everywhere: 10 - 15 ([MySQL fork](https://github.com/mabdullahadeel/cookiecutter-django-mysql) also available).
+- Uses PostgreSQL everywhere: 12 - 16 ([MySQL fork](https://github.com/mabdullahadeel/cookiecutter-django-mysql) also available).
 - Environment variables for configuration (This won't work with Apache/mod_wsgi).
 
 ## Support this Project!
@@ -133,12 +133,11 @@ Answer the prompts with your own desired [options](http://cookiecutter-django.re
     Choose from 1, 2, 3 [1]: 1
     use_docker [n]: n
     Select postgresql_version:
-    1 - 15
-    2 - 14
-    3 - 13
-    4 - 12
-    5 - 11
-    6 - 10
+    1 - 16
+    2 - 15
+    3 - 14
+    4 - 13
+    5 - 12
     Choose from 1, 2, 3, 4, 5 [1]: 1
     Select cloud_provider:
     1 - AWS
diff --git a/cookiecutter.json b/cookiecutter.json
index e343617d1..4eeede9c0 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -18,7 +18,7 @@
   "windows": "n",
   "editor": ["None", "PyCharm", "VS Code"],
   "use_docker": "n",
-  "postgresql_version": ["15", "14", "13", "12", "11", "10"],
+  "postgresql_version": ["16", "15", "14", "13", "12"],
   "cloud_provider": ["AWS", "GCP", "Azure", "None"],
   "mail_service": [
     "Mailgun",
diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst
index 967b42426..23c8e9178 100644
--- a/docs/project-generation-options.rst
+++ b/docs/project-generation-options.rst
@@ -66,12 +66,11 @@ use_docker:
 postgresql_version:
     Select a PostgreSQL_ version to use. The choices are:
 
-    1. 15
-    2. 14
-    3. 13
-    4. 12
-    5. 11
-    6. 10
+    1. 16
+    2. 15
+    3. 14
+    4. 13
+    5. 12
 
 cloud_provider:
     Select a cloud provider for static & media files. The choices are:
diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index b744a986c..6b581b03a 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -57,12 +57,11 @@ SUPPORTED_COMBINATIONS = [
     {"editor": "VS Code"},
     {"use_docker": "y"},
     {"use_docker": "n"},
+    {"postgresql_version": "16"},
     {"postgresql_version": "15"},
     {"postgresql_version": "14"},
     {"postgresql_version": "13"},
     {"postgresql_version": "12"},
-    {"postgresql_version": "11"},
-    {"postgresql_version": "10"},
     {"cloud_provider": "AWS", "use_whitenoise": "y"},
     {"cloud_provider": "AWS", "use_whitenoise": "n"},
     {"cloud_provider": "GCP", "use_whitenoise": "y"},