[Merge] ~chris.macnaughton/ubuntu/+source/ceph:ubuntu/lunar into ~ubuntu-server-dev/ubuntu/+source/ceph:ubuntu/lunar

[Bryce Harrington]

Review: Needs Fixing

A couple notes but otherwise glad to see this.

Have you doublechecked that this change is sufficient to resolve the autopkgtest issues?  (I'd toss it in a PPA and run autopkgtest against it, but might be ok to just run them locally in lxc).


Diff comments:

> diff --git a/debian/changelog b/debian/changelog
> index 7c73d1f..420b158 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,3 +1,11 @@
> +ceph (17.2.0-0ubuntu5) UNRELEASED; urgency=medium

UNRLEASED should be lunar here

> +
> +  * d/p/enable-python311.patch: Cherry-pick upstream change to
> +    enable Python 3.11 support (LP: #2004038).
> +  * d/gbp.conf: Update default-branch to lunar.
> +
> + -- Chris MacNaughton <chris.macnaughton at ubuntu.com>  Mon, 30 Jan 2023 20:02:09 +0000
> +
>  ceph (17.2.0-0ubuntu4) kinetic; urgency=medium
>  
>    * d/p/fix-kinetic-libfmt.patch: Apply fixes for libfmt > 8.
> diff --git a/debian/patches/enable-python311.patch b/debian/patches/enable-python311.patch
> new file mode 100644
> index 0000000..8a0bfd0
> --- /dev/null
> +++ b/debian/patches/enable-python311.patch
> @@ -0,0 +1,15 @@
> +Description: cmake: add support for python 3.11

For DEP3 completeness I'd suggest including

Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ceph/+bug/2004038

> +Origin: https://github.com/ceph/ceph/pull/48947
> +Index: ceph/cmake/modules/FindPython/Support.cmake
> +===================================================================
> +--- ceph.orig/cmake/modules/FindPython/Support.cmake
> ++++ ceph/cmake/modules/FindPython/Support.cmake
> +@@ -17,7 +17,7 @@ if (NOT DEFINED _${_PYTHON_PREFIX}_REQUI
> +   message (FATAL_ERROR "FindPython: INTERNAL ERROR")
> + endif()
> + if (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL 3)
> +-  set(_${_PYTHON_PREFIX}_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
> ++  set(_${_PYTHON_PREFIX}_VERSIONS 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
> + elseif (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL 2)
> +   set(_${_PYTHON_PREFIX}_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
> + else()


-- 
https://code.launchpad.net/~chris.macnaughton/ubuntu/+source/ceph/+git/ceph/+merge/436565
Your team Ubuntu Server Developers is subscribed to branch ~ubuntu-server-dev/ubuntu/+source/ceph:ubuntu/lunar.