[Merge] ~rs2009/unity:master into unity:master

[Dmitry Shachnev]

Some my previous comments are still valid:
- invalid trove classifier
- reference to non-existing license file
- bare "except:"

And a few new comments.

Diff comments:

> diff --git a/debian/rules b/debian/rules
> index 4b29c43..0c842ca 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -36,13 +36,14 @@ override_dh_auto_configure:
>  override_dh_install:
>  	# install autopilot tests
>  	cd tests/autopilot; \
> -	set -ex; for python in $(shell py3versions -r); do \
> -        $$python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \
> -	done; \
> -	cd $(CURDIR)
> +        python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb;
>  	find debian/tmp/usr/lib -name \*.*a -exec rm {} \;
>  	rm -rf debian/tmp/usr/share/gconf/schemas
> -	dh_install --fail-missing
> +	# install uwidgets
> +	cd uwidgets; \
> +        python3 setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \

No need for \ at the end, and no need for "cd $(CURDIR)" two lines below.

> +	install -Dm755 $(CURDIR)/debian/tmp/usr/etc/xdg/autostart/uwidgets-runner.desktop $(CURDIR)/debian/tmp/etc/xdg/autostart/uwidgets-runner.desktop
> +	cd $(CURDIR); dh_install --fail-missing
>  
>  override_dh_gencontrol:
>  	dh_gencontrol -- -Vcoreabiversion=$(CORE_ABIVERSION) -Vnuxabiversion=$(NUX_ABIVERSION) -Vunity-default-masterscopes="$(SCOPES_RECOMMENDS)"
> diff --git a/uwidgets/setup.py b/uwidgets/setup.py
> new file mode 100755
> index 0000000..335301c
> --- /dev/null
> +++ b/uwidgets/setup.py
> @@ -0,0 +1,67 @@
> +#!/usr/bin/env python3
> +
> +"""
> +This file is part of "uwidgets" which is released under GPL.
> +
> +See file LICENCE or go to http://www.gnu.org/licenses/ for full license
> +details.
> +
> +uwidgets is a desktop widget creation and management library for Python 3.
> +
> +Copyright (c) 2022 Rudra Saraswat <rs2009 at ubuntu.com>.
> +Copyright (c) 2018 Gabriele N. Tornetta <phoenix1987 at gmail.com>.
> +
> +This program is free software: you can redistribute it and/or modify
> +it under the terms of the GNU 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 General Public License for more details.
> +You should have received a copy of the GNU General Public License
> +along with this program.  If not, see <http://www.gnu.org/licenses/>.
> +"""
> +
> +from setuptools import Extension, find_packages, setup
> +
> +x11 = Extension('uwidgets._x11',
> +    include_dirs       = ['/usr/include/cairo/'],
> +    libraries          = ['cairo', 'X11', 'Xinerama'],

You specify include dirs and libraries here and in setup.cfg. Do we need that in two places?

> +    extra_compile_args = ['-std=c99'],
> +    sources            = [
> +        'uwidgets/x11/_x11module.c',
> +        'uwidgets/x11/atelier.c',
> +        'uwidgets/x11/base_canvas.c',
> +    ]
> +)
> +
> +
> +setup(
> +    name             = 'uwidgets',
> +    version          = '1.0.0',
> +    description      = 'Desktop Widget Manager for Unity, based on Blighty.',
> +    author           = 'Rudra Saraswat',
> +    author_email     = 'rs2009 at ubuntu.com',
> +    url              = 'https://unityd.org',
> +    classifiers=[
> +        'Development Status :: 1 - Production/Stable',
> +
> +        'Intended Audience :: Developers',
> +        'Topic :: Software Development :: Build Tools',
> +
> +        'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
> +
> +        'Programming Language :: Python :: 3',
> +        'Programming Language :: Python :: 3.11',
> +    ],
> +    keywords         = 'desklet widget infotainment',
> +    packages         = find_packages(exclude=['contrib', 'docs']),
> +    ext_modules      = [x11],
> +    install_requires = ['pycairo'],
> +    scripts          = ['uwidgets-runner'],
> +    extras_require   = {
> +        'test': ['pytest-xvfb', 'psutil'],

Actually, are there tests at all?

> +    },
> +)


-- 
https://code.launchpad.net/~rs2009/unity/+git/unity/+merge/437213
Your team Unity Team is subscribed to branch unity:master.