[Merge] ~cpete/ubuntu-dev-tools:update-python-launchpadlib into ubuntu-dev-tools:main

Chris Peterson mp+461309 at code.launchpad.net
Fri Mar 1 21:49:56 UTC 2024


Thanks for your review! I think maybe I've made this confusing by linking to the upstream MP for the bug fix. Would it be more appropriate to handle the bug fix and upstream changes separately? i.e. produce a debdiff on the bug just for the packaging changes needed and then get things fixed here later?  

Diff comments:

> diff --git a/debian/changelog b/debian/changelog
> index 114432a..437e6c8 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,3 +1,10 @@
> +ubuntu-dev-tools (0.202) UNRELEASED; urgency=medium

Correct, the upstream repository is the one this MP is open against.

The typical work flow for this repo AFAICT is to collect changes under an UNRELEASED changelog and, when ready to upload a new version, convert to unstable and upload to Debian. Then changes migrate over to the Ubuntu via the normal sync process. This is outlined in the README.updates file.

> +
> +  * Replace Depends on python3-launchpadlib with Depends on
> +    python3-launchpadlib-desktop (LP: #2049217)
> +
> + -- Chris Peterson <chris.peterson at canonical.com>  Mon, 26 Feb 2024 15:36:48 -0800
> +
>  ubuntu-dev-tools (0.201) unstable; urgency=medium
>  
>    * running-autopkgtests: fix packaging to make the script available
> diff --git a/ubuntutools/test/test_requestsync.py b/ubuntutools/test/test_requestsync.py
> new file mode 100644
> index 0000000..09fa3c4
> --- /dev/null
> +++ b/ubuntutools/test/test_requestsync.py
> @@ -0,0 +1,36 @@
> +# Copyright (C) 2024 Canonical Ltd.
> +# Author: Chris Peterson <chris.peterson at canonical.com>
> +#
> +# This program is free software: you can redistribute it and/or modify
> +# it under the terms of the GNU Affero General Public License as
> +# published by the Free Software Foundation, either version 3 of the
> +# License, or (at your option) any later version.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +# GNU Affero General Public License for more details.
> +#
> +# You should have received a copy of the GNU Affero General Public License
> +# along with this program.  If not, see <http://www.gnu.org/licenses/>.

Thanks for pointing out. I've done this work as a Canonical employee, which to my understanding means new files I've introduced should be AGPLv3. I will update debian/copyright accordingly.

> +
> +import unittest
> +
> +
> +# Binary Tests
> +class BinaryTests(unittest.TestCase):
> +
> +    # The requestsync binary has the option of using the launchpad api
> +    # to log in but requires python3-keyring in addition to
> +    # python3-launchpadlib. Testing the integrated login functionality
> +    # automatically isn't very feasbile, but we can at least write a smoke
> +    # test to make sure the required packages are installed.
> +    # See LP: #2049217
> +    def test_keyring_installed(self):
> +        """Smoke test for required lp api dependencies"""
> +        try:
> +            import keyring  # noqa: F401
> +        except ModuleNotFoundError:
> +            raise ModuleNotFoundError(
> +                "package python3-keyring is not installed"
> +            )


-- 
https://code.launchpad.net/~cpete/ubuntu-dev-tools/+git/ubuntu-dev-tools/+merge/461309
Your team Ubuntu Development Team is subscribed to branch ubuntu-dev-tools:main.




More information about the Ubuntu-reviews mailing list