Philipp Hörist pushed to branch master at gajim / gajim

Commits: 08e7113b by Philipp Hörist at 2022-12-23T01:08:28+01:00 ci: Unfreeze pyright version

- - - - - a4cc40e2 by Philipp Hörist at 2022-12-23T01:10:22+01:00 cfix: Main: Import PluginManifest from correct module

- - - - - d710b97b by Philipp Hörist at 2022-12-23T01:12:03+01:00 cq: Remove unused import

- - - - - f233e830 by Philipp Hörist at 2022-12-23T01:16:01+01:00 cfix: Plugins: Allow GajimPlugin import directly from package

- - - - -

4 changed files:

- .gitlab-ci.yml - gajim/gtk/main.py - gajim/plugins/__init__.py - gajim/plugins/manifest.py

Changes:

===================================== .gitlab-ci.yml ===================================== @@ -27,7 +27,7 @@ test-pyright: script: - pip3 install git+https://dev.gajim.org/gajim/python-nbxmpp.git - PYGOBJECT_STUB_CONFIG=Gtk3,Gdk3,Soup2 pip3 install git+https://github.com/pygobject/pygobject-stubs.git - - npm install pyright@1.1.284 + - npm install pyright - python3 .ci/link-gtk.py - $(npm bin)/pyright --version - $(npm bin)/pyright

===================================== gajim/gtk/main.py ===================================== @@ -46,7 +46,7 @@ from gajim.common.helpers import show_in_folder from gajim.common.modules.bytestream import is_transfer_active from gajim.common.modules.contacts import GroupchatContact -from gajim.plugins.pluginmanager import PluginManifest +from gajim.plugins.manifest import PluginManifest from gajim.plugins.repository import PluginRepository

from .account_side_bar import AccountSideBar

===================================== gajim/plugins/__init__.py ===================================== @@ -0,0 +1,5 @@ + + +from .gajimplugin import GajimPlugin + +__all__ = ["GajimPlugin"]

===================================== gajim/plugins/manifest.py ===================================== @@ -26,7 +26,6 @@ from packaging.requirements import Requirement

import gajim -from gajim.common.i18n import _

from gajim.plugins.plugins_i18n import _ as p_ from gajim.plugins.helpers import is_shipped_plugin

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/0ff8fb9ad236145e7ec2570c4a9aecaf...