From 1625cfa4c2236505ab0d4ba15905483cdd4dbb38 Mon Sep 17 00:00:00 2001
From: Richard Gildea <rjgildea@users.noreply.github.com>
Date: Fri, 30 Jun 2023 09:42:21 +0100
Subject: [PATCH] Drop Python 3.8 support (#642)

Upstream dependencies (e.g. numpy, scipy) have now dropped Python 3.8
support in latest releases.

Add Python 3.11 support.

See also https://dials.github.io/kb/proposals/dc3

---------

Co-authored-by: Nicholas Devenish <ndevenish@gmail.com>
---
 .azure-pipelines/azure-pipelines.yml | 20 +++++++++++---------
 .azure-pipelines/bootstrap.py        |  2 +-
 newsfragments/642.misc               |  1 +
 setup.cfg                            |  3 ++-
 4 files changed, 15 insertions(+), 11 deletions(-)
 create mode 100644 newsfragments/642.misc

diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index ccd5c6918..c5ec71f44 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -14,11 +14,11 @@ stages:
     steps:
       - checkout: none
 
-      # Use Python >=3.8 for syntax validation
+      # Use Python >=3.9 for syntax validation
       - task: UsePythonVersion@0
         displayName: Set up python
         inputs:
-          versionSpec: 3.8
+          versionSpec: 3.9
 
       # Run syntax validation on a shallow clone
       - bash: |
@@ -78,7 +78,7 @@ stages:
         vmImage: ubuntu-20.04
       timeoutInMinutes: 60
       variables:
-        PYTHON_VERSION: 3.8
+        PYTHON_VERSION: 3.9
       steps:
       - template: unix-build.yml
 
@@ -88,10 +88,10 @@ stages:
         vmImage: ubuntu-20.04
       strategy:
         matrix:
-          python38:
-            PYTHON_VERSION: 3.8
           python39:
             PYTHON_VERSION: 3.9
+          python311:
+            PYTHON_VERSION: 3.11
       timeoutInMinutes: 60
       steps:
       - template: unix-build.yml
@@ -101,10 +101,10 @@ stages:
         vmImage: macOS-latest
       strategy:
         matrix:
-          python38:
-            PYTHON_VERSION: 3.8
           python39:
             PYTHON_VERSION: 3.9
+          python311:
+            PYTHON_VERSION: 3.11
       timeoutInMinutes: 60
       steps:
       - template: unix-build.yml
@@ -114,8 +114,10 @@ stages:
         vmImage: windows-2019
       strategy:
         matrix:
-          python38:
-            PYTHON_VERSION: 3.8
+          python39:
+            PYTHON_VERSION: 3.9
+          python311:
+            PYTHON_VERSION: 3.11
       timeoutInMinutes: 20
       steps:
       - template: windows-build.yml
diff --git a/.azure-pipelines/bootstrap.py b/.azure-pipelines/bootstrap.py
index d475d7709..becd7a72b 100644
--- a/.azure-pipelines/bootstrap.py
+++ b/.azure-pipelines/bootstrap.py
@@ -847,7 +847,7 @@ def run():
         "--python",
         help="Install this minor version of Python (default: %(default)s)",
         default="3.9",
-        choices=("3.8", "3.9", "3.10"),
+        choices=("3.9", "3.10", "3.11"),
     )
     parser.add_argument(
         "--branch",
diff --git a/newsfragments/642.misc b/newsfragments/642.misc
new file mode 100644
index 000000000..b8a2436d1
--- /dev/null
+++ b/newsfragments/642.misc
@@ -0,0 +1 @@
+Drop Python 3.8 support in line with https://dials.github.io/kb/proposals/dc3. Add Python 3.11 support.
diff --git a/setup.cfg b/setup.cfg
index 8c0ba29aa..3a93e3ec8 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -8,8 +8,9 @@ classifiers =
     Operating System :: Microsoft :: Windows
     Operating System :: POSIX :: Linux
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
 
 [flake8]
 # Black disagrees with flake8 on a few points. Ignore those.