From d2137f3618dc27ea5a9e4186f3c9753db87d5a6d Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Tue, 18 Feb 2025 12:04:48 +0000
Subject: [PATCH 1/2] Prepare release notes for 3.11

---
 doc/history.rst        | 16 ++++++++++++++++
 doc/pyproject_toml.rst |  4 +++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/doc/history.rst b/doc/history.rst
index 70ed0190..3d36fab8 100644
--- a/doc/history.rst
+++ b/doc/history.rst
@@ -1,6 +1,22 @@
 Release history
 ===============
 
+Version 3.11
+------------
+
+- Support for SPDX license expressions and multiple license files, as detailed
+  in :pep:`639`::
+
+        license = "BSD-3-Clause"
+        license-files = ["LICENSE"]
+
+  For now, only a single license identifier is allowed. More complex expressions
+  describing multiple licenses & expressions may be supported in a future
+  version.
+- The `metadata format <https://packaging.python.org/en/latest/specifications/core-metadata/>`_
+  in produced packages is now version 2.4, to support the expanded license
+  information.
+
 Version 3.10.1
 --------------
 
diff --git a/doc/pyproject_toml.rst b/doc/pyproject_toml.rst
index 15bbf199..da25842c 100644
--- a/doc/pyproject_toml.rst
+++ b/doc/pyproject_toml.rst
@@ -20,13 +20,15 @@ defined by PEP 517. For any new project using Flit, it will look like this:
 .. code-block:: toml
 
     [build-system]
-    requires = ["flit_core >=3.2,<4"]
+    requires = ["flit_core >=3.11,<4"]
     build-backend = "flit_core.buildapi"
 
 Version constraints:
 
 - For now, all packages should specify ``<4``, so they won't be impacted by
   changes in the next major version.
+- ``license-files`` and license expressions in the ``license`` field require
+  ``flit_core >=3.11``.
 - :ref:`pyproject_toml_project` requires ``flit_core >=3.2``
 - :ref:`pyproject_old_metadata` requires ``flit_core >=2,<4``
 - The older :doc:`flit.ini file <flit_ini>` requires ``flit_core <3``.

From 389c23c797f203762095daa0d100a5d6fa198d45 Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Tue, 18 Feb 2025 12:08:58 +0000
Subject: [PATCH 2/2] =?UTF-8?q?Bump=20version:=203.10.1=20=E2=86=92=203.11?=
 =?UTF-8?q?.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg                | 2 +-
 doc/conf.py                     | 2 +-
 flit/__init__.py                | 2 +-
 flit_core/flit_core/__init__.py | 2 +-
 pyproject.toml                  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index a41187a6..a325e861 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.10.1
+current_version = 3.11.0
 commit = True
 tag = False
 
diff --git a/doc/conf.py b/doc/conf.py
index 979d26ca..d5dd799d 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -57,7 +57,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '3.10.1'
+version = '3.11.0'
 # The full version, including alpha/beta/rc tags.
 release = version #+ '.1'
 
diff --git a/flit/__init__.py b/flit/__init__.py
index dc0cc08d..ab2cbeb5 100644
--- a/flit/__init__.py
+++ b/flit/__init__.py
@@ -12,7 +12,7 @@
 from .config import ConfigError
 from .log import enable_colourful_output
 
-__version__ = '3.10.1'
+__version__ = '3.11.0'
 
 log = logging.getLogger(__name__)
 
diff --git a/flit_core/flit_core/__init__.py b/flit_core/flit_core/__init__.py
index 5f06a84d..a55c04e7 100644
--- a/flit_core/flit_core/__init__.py
+++ b/flit_core/flit_core/__init__.py
@@ -4,4 +4,4 @@
 All the convenient development features live in the main 'flit' package.
 """
 
-__version__ = '3.10.1'
+__version__ = '3.11.0'
diff --git a/pyproject.toml b/pyproject.toml
index 6e2e3a14..e7202a19 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -8,7 +8,7 @@ authors = [
     {name = "Thomas Kluyver", email = "thomas@kluyver.me.uk"},
 ]
 dependencies = [
-    "flit_core >=3.10.1",
+    "flit_core >=3.11.0",
     "requests",
     "docutils",
     "tomli-w",