Merge pull request #737 from pypa/changelog-3.12

takluyver · web-flow · commit 1c8141722066 · 2025-03-25T07:59:52.000Z
Prepare to release 3.12
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.11.0
+current_version = 3.12.0
 commit = True
 tag = False
 
diff --git a/doc/conf.py b/doc/conf.py
@@ -57,7 +57,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '3.11.0'
+version = '3.12.0'
 # The full version, including alpha/beta/rc tags.
 release = version #+ '.1'
 
diff --git a/doc/history.rst b/doc/history.rst
@@ -1,6 +1,15 @@
 Release history
 ===============
 
+Version 3.12
+------------
+
+- Support for license expressions using the AND and OR operators (:ghpull:`731`).
+- Recognise ``__version__: str = "0.1"`` annotated assignments when finding the
+  version number (:ghpull:`728`).
+- Clear error message when referring to a license file in a parent directory,
+  which is not supported (:ghpull:`725`).
+
 Version 3.11
 ------------
 
diff --git a/flit/__init__.py b/flit/__init__.py
@@ -12,7 +12,7 @@
 from .config import ConfigError
 from .log import enable_colourful_output
 
-__version__ = '3.11.0'
+__version__ = '3.12.0'
 
 log = logging.getLogger(__name__)
 
diff --git 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.11.0'
+__version__ = '3.12.0'
diff --git a/pyproject.toml b/pyproject.toml
@@ -8,7 +8,7 @@ authors = [
     {name = "Thomas Kluyver", email = "thomas@kluyver.me.uk"},
 ]
 dependencies = [
-    "flit_core >=3.11.0",
+    "flit_core >=3.12.0",
     "requests",
     "docutils",
     "tomli-w",

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@`
`57`	`57`	`# built documents.`
`58`	`58`	`#`
`59`	`59`	`# The short X.Y version.`
`60`		`-version = '3.11.0'`
	`60`	`+version = '3.12.0'`
`61`	`61`	`# The full version, including alpha/beta/rc tags.`
`62`	`62`	`release = version #+ '.1'`
`63`	`63`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ authors = [`
`8`	`8`	`{name = "Thomas Kluyver", email = "[email protected]"},`
`9`	`9`	`]`
`10`	`10`	`dependencies = [`
`11`		`- "flit_core >=3.11.0",`
	`11`	`+ "flit_core >=3.12.0",`
`12`	`12`	`"requests",`
`13`	`13`	`"docutils",`
`14`	`14`	`"tomli-w",`