Commits January 2023

commits@gajim.org

1 participants
135 discussions

[Git][gajim/gajim][master] ci: Windows: Don’t fail on dependency check
by Philipp Hörist (＠lovetox) 06 Jan '23

06 Jan '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: c70e2981 by Philipp Hörist at 2023-01-06T17:10:03+01:00 ci: Windows: Don’t fail on dependency check - - - - - 1 changed file: - win/misc/depcheck.py Changes: ===================================== win/misc/depcheck.py ===================================== @@ -25,7 +25,8 @@ log = logging.getLogger() IGNORED_LIBS = [ - ('Soup', '2.4') + ('Soup', '2.4'), + ('Gtk', '4.0') ] def get_required_by_typelibs() -> set[str]: @@ -35,7 +36,12 @@ def get_required_by_typelibs() -> set[str]: namespace, version = os.path.splitext(tl)[0].split('-', 1) if (namespace, version) in IGNORED_LIBS: continue - repo.require(namespace, version, 0) + try: + repo.require(namespace, version, 0) + except Exception as error: + log.warning('Unable to load %s %s: %s', + namespace, version, error) + continue lib = repo.get_shared_library(namespace) if lib: deps.update(lib.split(',')) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c70e29813cbc0381a565b5102ddb28b5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c70e29813cbc0381a565b5102ddb28b5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Windows: Fail appveyor build on exception
by Philipp Hörist (＠lovetox) 06 Jan '23

06 Jan '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: ed399554 by Philipp Hörist at 2023-01-06T16:33:44+01:00 ci: Windows: Fail appveyor build on exception - - - - - 1 changed file: - .ci/appveyor.yml Changes: ===================================== .ci/appveyor.yml ===================================== @@ -50,8 +50,11 @@ build_script: bash "git clone C:/projects/gajim C:/msys64/home/appveyor/gajim" bash "C:/msys64/home/appveyor/gajim/win/build.sh $($env:MSYS_ARCH)" + if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) } + Push-AppveyorArtifact "$($buildroot)/Gajim.exe" -FileName "$($filename).exe" Push-AppveyorArtifact "$($buildroot)/Gajim-Portable.exe" -FileName "$($filename_portable).exe" + if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) } # on_finish: # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ed399554bff29cb00ad50071942d292c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ed399554bff29cb00ad50071942d292c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Windows: Ignore Soup 2.4 in dependency check
by Philipp Hörist (＠lovetox) 06 Jan '23

06 Jan '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 14d951fd by Philipp Hörist at 2023-01-06T16:21:49+01:00 ci: Windows: Ignore Soup 2.4 in dependency check - - - - - 1 changed file: - win/misc/depcheck.py Changes: ===================================== win/misc/depcheck.py ===================================== @@ -24,12 +24,17 @@ logging.basicConfig(level='INFO', format='%(levelname)s: %(message)s') log = logging.getLogger() +IGNORED_LIBS = [ + ('Soup', '2.4') +] def get_required_by_typelibs() -> set[str]: deps: set[str] = set() repo = GIRepository.Repository() for tl in os.listdir(repo.get_search_path()[0]): namespace, version = os.path.splitext(tl)[0].split('-', 1) + if (namespace, version) in IGNORED_LIBS: + continue repo.require(namespace, version, 0) lib = repo.get_shared_library(namespace) if lib: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/14d951fd093b32b39c849464a0edfe44… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/14d951fd093b32b39c849464a0edfe44… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Update IANA data
by Philipp Hörist (＠lovetox) 06 Jan '23

06 Jan '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2484c634 by Philipp Hörist at 2023-01-06T16:02:42+01:00 chore: Update IANA data - - - - - 1 changed file: - gajim/common/iana.py Changes: ===================================== gajim/common/iana.py ===================================== @@ -1,4 +1,4 @@ -# Generated by get_iana_data.py @ 2022-11-30T19:55:30.680829 +# Generated by get_iana_data.py @ 2023-01-06T15:02:19.382281 URI_SCHEMES = { 'aaa', @@ -304,6 +304,7 @@ 'spotify', 'ssb', 'ssh', + 'starknet', 'steam', 'stun', 'stuns', View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2484c6344fa9414677c4111acc106d8d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2484c6344fa9414677c4111acc106d8d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Update translations
by Philipp Hörist (＠lovetox) 06 Jan '23

06 Jan '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 13e8cce2 by Weblate at 2023-01-06T16:01:24+01:00 chore: Update translations - - - - - 4 changed files: - po/LINGUAS - po/be.po - po/be(a)latin.po - po/bg.po The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/13e8cce22645e1f7485e87a4ce1ddd92… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/13e8cce22645e1f7485e87a4ce1ddd92… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: cfix: Fix typo in requirements
by Philipp Hörist (＠lovetox) 06 Jan '23

06 Jan '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7212d00a by Philipp Hörist at 2023-01-06T15:18:10+01:00 cfix: Fix typo in requirements - - - - - 1adf9f51 by Philipp Hörist at 2023-01-06T15:19:26+01:00 ci: Fix ruff version - - - - - 2 changed files: - .gitlab-ci.yml - setup.cfg Changes: ===================================== .gitlab-ci.yml ===================================== @@ -39,7 +39,7 @@ test-ruff: - changes: - "**/*.py" script: - - pip3 install ruff + - pip3 install ruff==0.0.211 - ruff . interruptible: true ===================================== setup.cfg ===================================== @@ -24,7 +24,7 @@ test_suite = test install_requires = css-parser keyring - nbxmpp>=4.0.0,5.0.0 + nbxmpp>=4.0.0,<5.0.0 packaging pillow precis-i18n>=1.0.0 View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/88bfeba44d96a0c1659d7c447f76caf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/88bfeba44d96a0c1659d7c447f76caf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] change: Raise required nbxmpp version to 4.0.0
by Philipp Hörist (＠lovetox) 06 Jan '23

06 Jan '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 88bfeba4 by Philipp Hörist at 2023-01-06T15:09:45+01:00 change: Raise required nbxmpp version to 4.0.0 - - - - - 4 changed files: - README.md - flatpak/org.gajim.Gajim.yaml - gajim/gajim.py - setup.cfg Changes: ===================================== README.md ===================================== @@ -6,7 +6,7 @@ ### Runtime Requirements - [PyGObject](https://pypi.org/project/PyGObject/) (>=3.42.0) - [pycairo](https://pypi.org/project/pycairo/) - [cairo](https://gitlab.freedesktop.org/cairo/cairo) (>=1.16.0) -- [nbxmpp](https://pypi.org/project/nbxmpp/) (>=3.2.5) +- [nbxmpp](https://pypi.org/project/nbxmpp/) (>=4.0.0) - [cryptography](https://pypi.org/project/cryptography/) (>=3.4.8) - [css-parser](https://pypi.org/project/css-parser/) - [keyring](https://pypi.org/project/keyring/) ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -316,11 +316,11 @@ modules: - name: python3-nbxmpp buildsystem: simple build-commands: - - pip3 install nbxmpp-3.2.5-py3-none-any.whl + - pip3 install nbxmpp-4.0.0-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/n/nbxmpp/nbxmpp-3.2.5-py3-none-… - sha256: cf22414dce04efe33cee14318fc334f1a16af11d4ed48b6aa18a8a0aa98bcb20 + url: https://files.pythonhosted.org/packages/py3/n/nbxmpp/nbxmpp-4.0.0-py3-none-… + sha256: 95028a037abe356647cb4c6bac632691117f00c1108a939caf7186e101bd332d - name: gajim buildsystem: simple ===================================== gajim/gajim.py ===================================== @@ -32,7 +32,7 @@ import gajim.gui -_MIN_NBXMPP_VER = '3.2.5' +_MIN_NBXMPP_VER = '4.0.0' _MIN_GTK_VER = '3.24.30' _MIN_CAIRO_VER = '1.16.0' _MIN_PYGOBJECT_VER = '3.42.0' ===================================== setup.cfg ===================================== @@ -24,7 +24,7 @@ test_suite = test install_requires = css-parser keyring - nbxmpp>=3.2.5,<4.0.0 + nbxmpp>=4.0.0,5.0.0 packaging pillow precis-i18n>=1.0.0 View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/88bfeba44d96a0c1659d7c447f76caf3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/88bfeba44d96a0c1659d7c447f76caf3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp] Pushed new tag 4.0.0
by Philipp Hörist (＠lovetox) 06 Jan '23

06 Jan '23

Philipp Hörist pushed new tag 4.0.0 at gajim / python-nbxmpp -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/tree/4.0.0 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 6 commits: chore: Update README.md
by Philipp Hörist (＠lovetox) 06 Jan '23

06 Jan '23

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: f1e91b86 by Philipp Hörist at 2023-01-06T14:11:46+01:00 chore: Update README.md - - - - - 7e3f72c0 by Philipp Hörist at 2023-01-06T14:12:39+01:00 change: Remove example client This is factored out into its own project https://pypi.org/project/nbxmpp-client/ - - - - - dc408e9f by Philipp Hörist at 2023-01-06T14:14:18+01:00 change: Raise required python version to 3.10 - - - - - 54ef1117 by Philipp Hörist at 2023-01-06T14:15:01+01:00 chore: Remove mypy.ini - - - - - 29aa827f by Philipp Hörist at 2023-01-06T14:41:14+01:00 chore: Move pyright config into pyproject.toml - - - - - e2070663 by Philipp Hörist at 2023-01-06T14:54:55+01:00 release: 4.0.0 - - - - - 10 changed files: - ChangeLog - README.md - − mypy.ini - nbxmpp/__init__.py - − nbxmpp/examples/__init__.py - − nbxmpp/examples/client.py - − nbxmpp/examples/client.ui - pyproject.toml - − pyrightconfig.json - setup.cfg Changes: ===================================== ChangeLog ===================================== @@ -1,3 +1,17 @@ +nbxmpp 4.0.0 (06 Jan 2023) + + New + + * Add message reactions (XEP-0444) support + * Add HTTP module + + Change + + * Raise required python version to 3.10 + * Remove example client + * Port to libsoup3 + * XEP-0392: Update to 0.8.0 + nbxmpp 3.2.5 (26 Oct 2022) New ===================================== README.md ===================================== @@ -4,17 +4,21 @@ ## Runtime Requirements -- python >= 3.9.0 -- PyGObject -- GLib >= 2.60 -- libsoup3 -- precis-i18n -- packaging -- idna +- [Python](https://www.python.org/) (>=3.10) +- [PyGObject](https://pypi.org/project/PyGObject/) (>=3.42.0) +- [GLib](https://gitlab.com/gnome/glib) (>=2.60.0) +- [libsoup3](https://libsoup.org/) +- [precis-i18n](https://pypi.org/project/precis-i18n/) +- [packaging](https://pypi.org/project/packaging/) +- [idna](https://pypi.org/project/idna/) ## Optional Runtime Requirements -- python-gssapi (for GSSAPI authentication https://pypi.org/project/gssapi/) +- [python-gssapi](https://pypi.org/project/gssapi/) GSSAPI authentication + +## Build Requirements + +- [setuptools](https://pypi.org/project/setuptools/) ## Features ===================================== mypy.ini deleted ===================================== @@ -1,14 +0,0 @@ -[mypy] -python_version = 3.9 -warn_unused_configs = True -disallow_incomplete_defs = True -allow_redefinition = True - -[mypy-gi.*] -ignore_missing_imports = True - -[mypy-precis_i18n.*] -ignore_missing_imports = True - -[mypy-idna.*] -ignore_missing_imports = True ===================================== nbxmpp/__init__.py ===================================== @@ -3,4 +3,4 @@ gi.require_version('Soup', '3.0') from .protocol import * # pylint: disable=wrong-import-position -__version__: str = '3.2.5' +__version__: str = '4.0.0' ===================================== nbxmpp/examples/__init__.py deleted ===================================== ===================================== nbxmpp/examples/client.py deleted ===================================== @@ -1,299 +0,0 @@ -#!/usr/bin/python3 - -import os -import logging -import json -from pathlib import Path - -import gi - -gi.require_version('Gtk', '3.0') -gi.require_version('GLib', '2.0') -from gi.repository import Gtk -from gi.repository import GLib - -import nbxmpp -from nbxmpp.protocol import JID -from nbxmpp.client import Client -from nbxmpp.http import HTTPSession -from nbxmpp.structs import ProxyData -from nbxmpp.structs import StanzaHandler -from nbxmpp.const import ConnectionType -from nbxmpp.const import ConnectionProtocol -from nbxmpp.const import StreamError -from nbxmpp.const import Mode - -consoleloghandler = logging.StreamHandler() -log = logging.getLogger('nbxmpp') -log.setLevel('INFO') -log.addHandler(consoleloghandler) - -formatter = logging.Formatter( - '%(asctime)s %(levelname)-7s %(name)-25s %(message)s', - datefmt='%H:%M:%S') -consoleloghandler.setFormatter(formatter) - - -class Builder: - def __init__(self, filename): - file_path = Path(__file__).resolve() - ui_file_path = file_path.parent / filename - self._builder = Gtk.Builder() - self._builder.add_from_file(str(ui_file_path)) - - def __getattr__(self, name): - try: - return getattr(self._builder, name) - except AttributeError: - return self._builder.get_object(name) - - -class StanzaRow(Gtk.ListBoxRow): - def __init__(self, stanza, incoming): - Gtk.ListBoxRow.__init__(self) - color = 'red' if incoming else 'blue' - if isinstance(stanza, bytes): - stanza = str(stanza) - if not isinstance(stanza, str): - stanza = stanza.__str__(fancy=True) - stanza = GLib.markup_escape_text(stanza) - label = Gtk.Label() - label.set_markup('<span foreground="%s">%s</span>' % (color, stanza)) - label.set_xalign(0) - label.set_halign(Gtk.Align.START) - self.add(label) - self.show_all() - - -class TestClient(Gtk.Window): - def __init__(self): - Gtk.Window.__init__(self, title='Test Client') - self.set_default_size(500, 500) - - self._builder = Builder('client.ui') - self._builder.connect_signals(self) - - self.add(self._builder.grid) - - self._client = None - self._scroll_timeout = None - self._create_paths() - self._load_config() - - def _create_client(self): - self._client = Client(log_context='TEST') - self._client.set_domain(self.address.domain) - self._client.set_username(self.address.localpart) - self._client.set_resource('test') - self._client.set_http_session(HTTPSession()) - - proxy_ip = self._builder.proxy_ip.get_text() - if proxy_ip: - proxy_port = int(self._builder.proxy_port.get_text()) - proxy_host = '%s:%s' % (proxy_ip, proxy_port) - proxy = ProxyData(self._builder.proxy_type.get_active_text().lower(), - proxy_host, - self._builder.proxy_username.get_text() or None, - self._builder.proxy_password.get_text() or None) - self._client.set_proxy(proxy) - - if self._builder.login_mode.get_active(): - self._client.set_mode(Mode.LOGIN_TEST) - elif self._builder.client_mode.get_active(): - self._client.set_mode(Mode.CLIENT) - elif self._builder.register_mode.get_active(): - self._client.set_mode(Mode.REGISTER) - elif self._builder.anon_mode.get_active(): - self._client.set_mode(Mode.ANONYMOUS_TEST) - else: - raise ValueError('No mode selected') - - self._client.set_connection_types(self._get_connection_types()) - self._client.set_protocols(self._get_connection_protocols()) - - self._client.set_password(self.password) - - self._client.subscribe('resume-failed', self._on_signal) - self._client.subscribe('resume-successful', self._on_signal) - self._client.subscribe('disconnected', self._on_signal) - self._client.subscribe('connection-lost', self._on_signal) - self._client.subscribe('connection-failed', self._on_signal) - self._client.subscribe('connected', self._on_connected) - - self._client.subscribe('stanza-sent', self._on_stanza_sent) - self._client.subscribe('stanza-received', self._on_stanza_received) - - self._client.register_handler(StanzaHandler('message', self._on_message)) - - @property - def password(self): - return self._builder.password.get_text() - - @property - def address(self): - return JID.from_string(self._builder.address.get_text()) - - @property - def xml_box(self): - return self._builder.xml_box - - def scroll_to_end(self): - adj_v = self._builder.scrolledwin.get_vadjustment() - if adj_v is None: - # This can happen when the Widget is already destroyed when called - # from GLib.idle_add - self._scroll_timeout = None - return - max_scroll_pos = adj_v.get_upper() - adj_v.get_page_size() - adj_v.set_value(max_scroll_pos) - - adj_h = self._builder.scrolledwin.get_hadjustment() - adj_h.set_value(0) - self._scroll_timeout = None - - def _on_signal(self, _client, signal_name, *args, **kwargs): - log.info('%s, Error: %s', signal_name, self._client.get_error()) - if signal_name == 'disconnected': - if self._client.get_error() is None: - return - domain, error, text = self._client.get_error() - if domain == StreamError.BAD_CERTIFICATE: - self._client.set_ignore_tls_errors(True) - self._client.connect() - - def _on_connected(self, _client, _signal_name): - self.send_presence() - - def _on_message(self, _stream, stanza, _properties): - log.info('Message received') - log.info(stanza.getBody()) - - def _on_stanza_sent(self, _stream, _signal_name, data): - self.xml_box.add(StanzaRow(data, False)) - self._add_scroll_timeout() - - def _on_stanza_received(self, _stream, _signal_name, data): - self.xml_box.add(StanzaRow(data, True)) - self._add_scroll_timeout() - - def _add_scroll_timeout(self): - if self._scroll_timeout is not None: - return - self._scroll_timeout = GLib.timeout_add(50, self.scroll_to_end) - - def _connect_clicked(self, *args): - if self._client is not None: - self._client.destroy() - - self._create_client() - - self._client.connect() - - def _disconnect_clicked(self, *args): - if self._client is not None: - self._client.disconnect() - - def _clear_clicked(self, *args): - self.xml_box.foreach(self._remove) - - def _on_reconnect_clicked(self, *args): - if self._client is not None: - self._client.reconnect() - - def _get_connection_types(self): - types = [] - if self._builder.directtls.get_active(): - types.append(ConnectionType.DIRECT_TLS) - if self._builder.starttls.get_active(): - types.append(ConnectionType.START_TLS) - if self._builder.plain.get_active(): - types.append(ConnectionType.PLAIN) - return types - - def _get_connection_protocols(self): - protocols = [] - if self._builder.tcp.get_active(): - protocols.append(ConnectionProtocol.TCP) - if self._builder.websocket.get_active(): - protocols.append(ConnectionProtocol.WEBSOCKET) - return protocols - - def _on_save_clicked(self, *args): - data = {} - data['jid'] = self._builder.address.get_text() - data['password'] = self._builder.password.get_text() - data['proxy_type'] = self._builder.proxy_type.get_active_text() - data['proxy_ip'] = self._builder.proxy_ip.get_text() - data['proxy_port'] = self._builder.proxy_port.get_text() - data['proxy_username'] = self._builder.proxy_username.get_text() - data['proxy_password'] = self._builder.proxy_password.get_text() - - data['directtls'] = self._builder.directtls.get_active() - data['starttls'] = self._builder.starttls.get_active() - data['plain'] = self._builder.plain.get_active() - data['tcp'] = self._builder.tcp.get_active() - data['websocket'] = self._builder.websocket.get_active() - - path = self._get_config_dir() / 'config' - with path.open('w') as fp: - json.dump(data, fp) - - def _load_config(self): - path = self._get_config_dir() / 'config' - if not path.exists(): - return - - with path.open('r') as fp: - data = json.load(fp) - - self._builder.address.set_text(data.get('jid', '')) - self._builder.password.set_text(data.get('password', '')) - self._builder.proxy_type.set_active_id(data.get('proxy_type', 'HTTP')) - self._builder.proxy_ip.set_text(data.get('proxy_ip', '')) - self._builder.proxy_port.set_text(data.get('proxy_port', '')) - self._builder.proxy_username.set_text(data.get('proxy_username', '')) - self._builder.proxy_password.set_text(data.get('proxy_password', '')) - - self._builder.directtls.set_active(data.get('directtls', False)) - self._builder.starttls.set_active(data.get('starttls', False)) - self._builder.plain.set_active(data.get('plain', False)) - self._builder.tcp.set_active(data.get('tcp', False)) - self._builder.websocket.set_active(data.get('websocket', False)) - - @staticmethod - def _get_config_dir(): - if os.name == 'nt': - return Path(os.path.join(os.environ['appdata'], 'nbxmpp')) - - expand = os.path.expanduser - base = os.getenv('XDG_CONFIG_HOME') - if base is None or base[0] != '/': - base = expand('~/.config') - return Path(os.path.join(base, 'nbxmpp')) - - def _create_paths(self): - path_ = self._get_config_dir() - if not path_.exists(): - for parent_path in reversed(path_.parents): - # Create all parent folders - # don't use mkdir(parent=True), as it ignores `mode` - # when creating the parents - if not parent_path.exists(): - print('creating %s directory' % parent_path) - parent_path.mkdir(mode=0o700) - print('creating %s directory' % path_) - path_.mkdir(mode=0o700) - - def _remove(self, item): - self.xml_box.remove(item) - item.destroy() - - def send_presence(self): - presence = nbxmpp.Presence() - self._client.send_stanza(presence) - - -win = TestClient() -win.connect("delete-event", Gtk.main_quit) -win.show_all() -Gtk.main() ===================================== nbxmpp/examples/client.ui deleted ===================================== @@ -1,564 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.20"/> -  - <object class="GtkGrid" id="grid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="margin-start">24</property> - <property name="margin-end">24</property> - <property name="margin-top">24</property> - <property name="margin-bottom">24</property> - <property name="row-spacing">12</property> - <child> - <object class="GtkButtonBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="spacing">12</property> - <property name="layout-style">start</property> - <child> - <object class="GtkButton"> - <property name="label" translatable="yes">Connect</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <signal name="clicked" handler="_connect_clicked" swapped="no"/> - <style> - <class name="suggested-action"/> - </style> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton"> - <property name="label" translatable="yes">Disconnect</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <signal name="clicked" handler="_disconnect_clicked" swapped="no"/> - <style> - <class name="destructive-action"/> - </style> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton"> - <property name="label" translatable="yes">Reconnect</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <signal name="clicked" handler="_on_reconnect_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkButton" id="clear"> - <property name="label" translatable="yes">Clear</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <signal name="clicked" handler="_clear_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> - </packing> - </child> - <child> -  - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="hexpand">True</property> - <property name="row-spacing">6</property> - <property name="column-spacing">12</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">XMPP-Address</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Password</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="address"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="password"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="valign">center</property> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Proxy Host or IP</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">3</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Proxy Port</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">4</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Proxy Password</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">6</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Proxy Username</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">5</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="proxy_ip"> - <property name="visible">True</property> - <property name="can-focus">True</property> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">3</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="proxy_username"> - <property name="visible">True</property> - <property name="can-focus">True</property> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">5</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="proxy_port"> - <property name="visible">True</property> - <property name="can-focus">True</property> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">4</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="proxy_password"> - <property name="visible">True</property> - <property name="can-focus">True</property> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">6</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Save</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">7</property> - </packing> - </child> - <child> - <object class="GtkButton"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Save</property> - <property name="halign">start</property> - <signal name="clicked" handler="_on_save_clicked" swapped="no"/> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">document-save-symbolic</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">7</property> - </packing> - </child> - <child> - <object class="GtkFrame"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label-xalign">0</property> - <property name="shadow-type">none</property> - <child> - <object class="GtkAlignment"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="top-padding">12</property> - <property name="bottom-padding">12</property> - <property name="left-padding">12</property> - <child> -  - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child> - <object class="GtkCheckButton" id="directtls"> - <property name="label" translatable="yes">DIRECT TLS</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="halign">start</property> - <property name="draw-indicator">True</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="starttls"> - <property name="label" translatable="yes">START TLS</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="halign">start</property> - <property name="draw-indicator">True</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="plain"> - <property name="label" translatable="yes">PLAIN</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="halign">start</property> - <property name="draw-indicator">True</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> - </packing> - </child> - </object> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Connection Type</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">2</property> - <property name="top-attach">0</property> - <property name="height">3</property> - </packing> - </child> - <child> - <object class="GtkFrame"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label-xalign">0</property> - <property name="shadow-type">none</property> - <child> - <object class="GtkAlignment"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="top-padding">12</property> - <property name="bottom-padding">12</property> - <property name="left-padding">12</property> - <child> -  - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child> - <object class="GtkCheckButton" id="tcp"> - <property name="label" translatable="yes">TCP</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="halign">start</property> - <property name="draw-indicator">True</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="websocket"> - <property name="label" translatable="yes">WEBSOCKET</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="halign">start</property> - <property name="draw-indicator">True</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> - </packing> - </child> - </object> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Connection Protocol</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">2</property> - <property name="top-attach">3</property> - <property name="height">3</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">Proxy Type</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="proxy_type"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">start</property> - <property name="active">0</property> - <items> - <item id="SOCKS5" translatable="yes">SOCKS5</item> - </items> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">2</property> - </packing> - </child> - <child> - <object class="GtkFrame"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label-xalign">0</property> - <property name="shadow-type">none</property> - <child> - <object class="GtkAlignment"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="top-padding">12</property> - <property name="bottom-padding">12</property> - <property name="left-padding">12</property> - <child> -  - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child> - <object class="GtkRadioButton" id="client_mode"> - <property name="label" translatable="yes">Client</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="active">True</property> - <property name="draw-indicator">True</property> - <property name="group">login_mode</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="login_mode"> - <property name="label" translatable="yes">Login</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="active">True</property> - <property name="draw-indicator">True</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="register_mode"> - <property name="label" translatable="yes">Register</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="active">True</property> - <property name="draw-indicator">True</property> - <property name="group">login_mode</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="anon_mode"> - <property name="label" translatable="yes">Anyonymous</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="active">True</property> - <property name="draw-indicator">True</property> - <property name="group">login_mode</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">3</property> - </packing> - </child> - </object> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Modes</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">2</property> - <property name="top-attach">6</property> - </packing> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="scrolledwin"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="shadow-type">in</property> - <child> - <object class="GtkViewport"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child> - <object class="GtkListBox" id="xml_box"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="vexpand">True</property> - </object> - </child> - </object> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> - </packing> - </child> - </object> -</interface> ===================================== pyproject.toml ===================================== @@ -3,3 +3,13 @@ requires = [ "setuptools >= 43.0.0", ] build-backend = "setuptools.build_meta" + + +[tool.pyright] +pythonVersion = "3.10" +pythonPlatform = "All" +typeCheckingMode = "strict" + +reportUnnecessaryTypeIgnoreComment = "error" +reportPropertyTypeMismatch = "error" +reportMissingModuleSource = "none" ===================================== pyrightconfig.json deleted ===================================== @@ -1,4 +0,0 @@ -{ - "ignore": ["**/test", "setup.py"], - "typeCheckingMode": "strict", -} ===================================== setup.cfg ===================================== @@ -1,6 +1,6 @@ [metadata] name = nbxmpp -version = 3.2.5 +version = 4.0.0 description = XMPP Library author = Yann Leboulanger, Philipp Hoerist author_email = gajim-devel(a)gajim.org @@ -11,10 +11,10 @@ url = https://dev.gajim.org/gajim/python-nbxmpp license_file = COPYING license = GPL v3 classifiers = - Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 [options] -python_requires = >=3.9 +python_requires = >=3.10 packages = find: install_requires = precis-i18n>=1.0.0 View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/964fa149cf0502bdb43b561… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/964fa149cf0502bdb43b561… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Run isort check
by Philipp Hörist (＠lovetox) 06 Jan '23

06 Jan '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: c0256ec6 by Philipp Hörist at 2023-01-06T10:33:08+01:00 ci: Run isort check - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -43,6 +43,16 @@ test-ruff: - ruff . interruptible: true +test-isort: + stage: test + rules: + - changes: + - "**/*.py" + script: + - pip3 install isort + - isort --check . + interruptible: true + test-unittest: stage: test script: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c0256ec65e4fcc7b1a5b10d0453f7d99… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c0256ec65e4fcc7b1a5b10d0453f7d99… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2023