Skip to content

Commit

Permalink
Merge pull request #722 from pypa/changelog-3.11
Browse files Browse the repository at this point in the history
Prepare to release 3.11
  • Loading branch information
takluyver authored Feb 19, 2025
2 parents e7c4239 + 389c23c commit 5f8c75f
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 3.10.1
current_version = 3.11.0
commit = True
tag = False

Expand Down
2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
16 changes: 16 additions & 0 deletions doc/history.rst
Original file line number Diff line number Diff line change
@@ -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
--------------

Expand Down
4 changes: 3 additions & 1 deletion doc/pyproject_toml.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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``.
Expand Down
2 changes: 1 addition & 1 deletion flit/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__)

Expand Down
2 changes: 1 addition & 1 deletion flit_core/flit_core/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
All the convenient development features live in the main 'flit' package.
"""

__version__ = '3.10.1'
__version__ = '3.11.0'
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ authors = [
{name = "Thomas Kluyver", email = "[email protected]"},
]
dependencies = [
"flit_core >=3.10.1",
"flit_core >=3.11.0",
"requests",
"docutils",
"tomli-w",
Expand Down

0 comments on commit 5f8c75f

Please sign in to comment.