Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] cfix: Use __future__ import for annotations
by Philipp Hörist (＠lovetox) 04 Dec '22

04 Dec '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 89507a76 by Philipp Hörist at 2022-12-04T11:42:45+01:00 cfix: Use __future__ import for annotations Fixes #11314 - - - - - 1 changed file: - gajim/gtk/avatar_selector.py Changes: ===================================== gajim/gtk/avatar_selector.py ===================================== @@ -15,6 +15,8 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from __future__ import annotations + from typing import Any from typing import cast from typing import Optional View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/89507a76cf454f36c798bc32db1e0efc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/89507a76cf454f36c798bc32db1e0efc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cq: Use builtin types for annotations
by Philipp Hörist (＠lovetox) 03 Dec '22

03 Dec '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 576b1aa1 by Philipp Hörist at 2022-12-04T00:57:07+01:00 cq: Use builtin types for annotations - - - - - 9 changed files: - gajim/common/application.py - gajim/common/multimedia_helpers.py - gajim/common/structs.py - gajim/gtk/component_search.py - gajim/gtk/css_config.py - gajim/gtk/exception.py - gajim/gtk/gstreamer.py - gajim/gtk/preferences.py - gajim/plugins/pluginmanager.py Changes: ===================================== gajim/common/application.py ===================================== @@ -15,7 +15,6 @@ from typing import Any from typing import Optional from typing import Union -from typing import Type from typing import TextIO import os @@ -258,7 +257,7 @@ def _show_warnings() -> None: os.environ['GAJIM_LEAK'] = 'true' def warn_with_traceback(message: Union[Warning, str], - category: Type[Warning], + category: type[Warning], filename: str, lineno: int, _file: Optional[TextIO] = None, ===================================== gajim/common/multimedia_helpers.py ===================================== @@ -15,7 +15,7 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. from __future__ import annotations -from typing import Dict + from typing import Optional import logging @@ -32,12 +32,12 @@ class DeviceManager: def __init__(self) -> None: - self.devices: Dict[str, str] = {} + self.devices: dict[str, str] = {} def detect(self) -> None: self.devices = {} - def get_devices(self) -> Dict[str, str]: + def get_devices(self) -> dict[str, str]: if not self.devices: self.detect() return self.devices @@ -73,7 +73,7 @@ def detect_element(self, name: str, text: str, pipe: str = '%s') -> None: class AudioInputManager(DeviceManager): def detect(self) -> None: - self.devices: Dict[str, str] = {} + self.devices: dict[str, str] = {} # Test src self.detect_element('audiotestsrc', _('Audio test'), @@ -94,7 +94,7 @@ def detect(self) -> None: class AudioOutputManager(DeviceManager): def detect(self) -> None: - self.devices: Dict[str, str] = {} + self.devices: dict[str, str] = {} # Fake sink self.detect_element('fakesink', _('Fake audio output')) # Auto sink @@ -107,7 +107,7 @@ def detect(self) -> None: class VideoInputManager(DeviceManager): def detect(self) -> None: - self.devices: Dict[str, str] = {} + self.devices: dict[str, str] = {} # Test src self.detect_element( 'videotestsrc', ===================================== gajim/common/structs.py ===================================== @@ -15,7 +15,6 @@ from __future__ import annotations from typing import Any -from typing import Type from typing import TypeVar from typing import NamedTuple from typing import Optional @@ -274,7 +273,7 @@ class VariantMixin: } def _get_type_and_variant_string(self, - field_type: str) -> tuple[Type[Any], str]: + field_type: str) -> tuple[type[Any], str]: variant_str = '' if 'Optional' in field_type: variant_str = 'm' @@ -319,7 +318,7 @@ def to_variant(self) -> GLib.Variant: return GLib.Variant('a{sv}', vdict) @classmethod - def from_variant(cls: Type[_T], variant: GLib.Variant) -> _T: + def from_variant(cls: type[_T], variant: GLib.Variant) -> _T: vdict = variant.unpack() __types = vdict.pop('__types', None) if __types is not None: ===================================== gajim/gtk/component_search.py ===================================== @@ -18,7 +18,6 @@ from typing import Any from typing import Optional from typing import Union -from typing import Type import logging import itertools @@ -243,7 +242,7 @@ def process_result(self, form: Optional[Node]) -> None: form = dataforms.extend_form(node=form) - fieldtypes: list[Union[Type[bool], Type[str]]] = [] + fieldtypes: list[Union[type[bool], type[str]]] = [] fieldvars: list[Any] = [] index = 0 for field in form.reported.iter_fields(): ===================================== gajim/gtk/css_config.py ===================================== @@ -16,9 +16,9 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. from __future__ import annotations + from typing import Optional from typing import Union -from typing import Tuple import math import logging @@ -348,7 +348,7 @@ def set_font(self, def _get_attr_from_description(self, description: Pango.FontDescription - ) -> Tuple[Optional[str], float, str, int]: + ) -> tuple[Optional[str], float, str, int]: size = description.get_size() / Pango.SCALE style = self._get_string_from_pango_style(description.get_style()) weight = self._pango_to_css_weight(int(description.get_weight())) ===================================== gajim/gtk/exception.py ===================================== @@ -20,7 +20,6 @@ from __future__ import annotations from typing import Any -from typing import Type from types import TracebackType import sys @@ -76,7 +75,7 @@ ...''' -def _hook(type_: Type[BaseException], +def _hook(type_: type[BaseException], value: BaseException, tb: TracebackType ) -> None: @@ -92,7 +91,7 @@ def _hook(type_: Type[BaseException], class ExceptionDialog(Gtk.ApplicationWindow): def __init__(self, - type_: Type[BaseException], + type_: type[BaseException], value: BaseException, tb: TracebackType ) -> None: ===================================== gajim/gtk/gstreamer.py ===================================== @@ -15,7 +15,6 @@ from __future__ import annotations from typing import Optional -from typing import Tuple from gi.repository import Gtk try: @@ -24,7 +23,7 @@ pass -def create_gtk_widget() -> Optional[Tuple[Gst.Element, +def create_gtk_widget() -> Optional[tuple[Gst.Element, Gtk.Widget, str]]: gtkglsink = Gst.ElementFactory.make('gtkglsink', None) ===================================== gajim/gtk/preferences.py ===================================== @@ -16,7 +16,6 @@ from typing import Any from typing import Optional from typing import cast -from typing import Type import logging import sys @@ -79,7 +78,7 @@ def __init__(self) -> None: self.add(self._ui.grid) - prefs: list[tuple[str, Type[PreferenceBox]]] = [ + prefs: list[tuple[str, type[PreferenceBox]]] = [ ('window_behaviour', WindowBehaviour), ('plugins', Plugins), ('general', General), @@ -116,7 +115,7 @@ def __init__(self) -> None: def get_ui(self): return self._ui - def _add_prefs(self, prefs: list[tuple[str, Type[PreferenceBox]]]): + def _add_prefs(self, prefs: list[tuple[str, type[PreferenceBox]]]): for ui_name, klass in prefs: pref_box = getattr(self._ui, ui_name) pref = klass(self) ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -16,7 +16,6 @@ from typing import Any from typing import Optional -from typing import Type import os import sys @@ -244,7 +243,7 @@ def init_plugins(self) -> None: def _load_plugin_module(self, manifest: PluginManifest - ) -> Optional[Type[GajimPlugin]]: + ) -> Optional[type[GajimPlugin]]: assert manifest.path is not None module_path = manifest.path / '__init__.py' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/576b1aa14beb694194bdc935edb58def… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/576b1aa14beb694194bdc935edb58def… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: Scripts: Fix various issues
by Philipp Hörist (＠lovetox) 03 Dec '22

03 Dec '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3d5363d0 by Philipp Hörist at 2022-12-04T00:41:11+01:00 refactor: Scripts: Fix various issues - Use logging module everywhere - Fix boolean traps - replace exit() with sys.exit() - - - - - 9 changed files: - .ci/appveyor_build.py - .ci/deploy.py - .ci/link-gtk.py - scripts/bump_version.py - scripts/generate_ui_types.py - scripts/update_translations.py - setup.py - win/misc/create-launcher.py - win/misc/depcheck.py Changes: ===================================== .ci/appveyor_build.py ===================================== @@ -2,14 +2,14 @@ from typing import Any +import logging import json import os import requests +import sys import time from pathlib import Path -from rich.console import Console - ACCOUNT = 'lovetox' PROJECT_SLUG = 'gajim' @@ -25,7 +25,8 @@ PROJECT_API_URL = f'{BASE_URL}/projects/{ACCOUNT}/{PROJECT_SLUG}' -console = Console() +logging.basicConfig(level='INFO', format='%(levelname)s: %(message)s') +log = logging.getLogger() def get_gajim_version() -> str: @@ -34,13 +35,13 @@ def get_gajim_version() -> str: tag = os.environ.get('CI_COMMIT_TAG') if tag is None: - exit('No tag found') + sys.exit('No tag found') return tag def push_yaml_to_project() -> None: - console.print('Push settings ...') - with open('.ci/appveyor.yml', 'r') as file: + log.info('Push settings ...') + with open('.ci/appveyor.yml') as file: yaml = file.read() req = requests.put(SETTINGS_API_URL, data=yaml, headers=HEADERS) @@ -48,7 +49,7 @@ def push_yaml_to_project() -> None: def start_build() -> str: - console.print('Start build ...') + log.info('Start build ...') payload = { 'accountName': ACCOUNT, 'projectSlug': PROJECT_SLUG, @@ -66,7 +67,7 @@ def start_build() -> str: def is_build_finished(build: dict[str, str]) -> bool: if build['status'] in ('failed', 'cancelled'): - exit('Found failed job') + sys.exit('Found failed job') return build['status'] == 'success' @@ -76,18 +77,18 @@ def check_for_response(build_id: str) -> None: while True: time.sleep(RETRY_TIMEOUT) - console.print('Check build status ...') + log.info('Check build status ...') req = requests.get(PROJECT_API_URL, headers=HEADERS) req.raise_for_status() response = req.json() build = response['build'] if build_id != build['buildId']: - exit('Unable to find buildid: %s' % build_id) + sys.exit('Unable to find buildid: %s' % build_id) if is_build_finished(build): break - console.print('Build status:', build['status']) + log.info('Build status: %s', build['status']) build_folder = Path.cwd() / 'build' build_folder.mkdir() @@ -96,7 +97,7 @@ def check_for_response(build_id: str) -> None: response = get_job_response(job['jobId']) result = build_folder / f'{job["jobId"]}.json' result.write_text(json.dumps(response)) - console.print('Write job response:', result) + log.info('Write job response: %s', result) def get_job_response(job_id: str) -> list[dict[str, Any]]: ===================================== .ci/deploy.py ===================================== @@ -4,6 +4,7 @@ from typing import Optional import functools +import logging import json import os import sys @@ -12,7 +13,6 @@ from pathlib import Path import requests -from rich.console import Console FTP_URL = 'panoramix.gajim.org' @@ -27,17 +27,19 @@ RELEASE_FOLDER_BASE = 'downloads' -console = Console() + +logging.basicConfig(level='INFO', format='%(levelname)s: %(message)s') +log = logging.getLogger() def ftp_connection(func: Any) -> Any: @functools.wraps(func) def func_wrapper(filedir: Path) -> None: ftp = FTP_TLS(FTP_URL, FTP_USER, FTP_PASS) - console.print('Successfully connected to', FTP_URL) + log.info('Successfully connected to %s', FTP_URL) func(ftp, filedir) ftp.quit() - console.print('Quit') + log.info('Quit') return return func_wrapper @@ -50,14 +52,14 @@ def get_release_folder_from_tag(tag: str) -> str: def get_gajim_tag() -> str: tag = os.environ.get('CI_COMMIT_TAG') if tag is None: - exit('No tag found') + sys.exit('No tag found') return tag def find_linux_tarball(filedir: Path) -> Path: files = list(filedir.glob('gajim-*.tar.gz')) if len(files) != 1: - exit('Unknown files found') + sys.exit('Unknown files found') return files[0] @@ -86,7 +88,7 @@ def upload_file(ftp: FTP_TLS, if name is None: name = filepath.name - console.print('Upload file', filepath.name, 'as', name) + log.info('Upload file %s as %s', filepath.name, name) with open(filepath, 'rb') as f: ftp.storbinary('STOR ' + name, f) @@ -103,7 +105,7 @@ def download_artifacts(path: Path) -> None: filename = artifact['fileName'] file_url = artifact['fileUrl'] - console.print('Download', filename, '...') + log.info('Download %s', filename) req = requests.get(file_url, headers=HEADERS) req.raise_for_status() ===================================== .ci/link-gtk.py ===================================== @@ -3,7 +3,9 @@ # Creates links from gui folder to all files in the gtk folder # This is needed for pyright to work correctly with the dynamic gui imports +import logging from pathlib import Path +import sys IGNORED_FILES = ['__init__.py'] IGNORED_DIRS = ['__pycache__'] @@ -11,12 +13,17 @@ cwd = Path.cwd() if cwd.name != 'gajim': - exit('Script needs to be excecuted from gajim repository root directory') + sys.exit('Script needs to be excecuted from gajim repository ' + 'root directory') gui_path = cwd / 'gajim' / 'gui' gtk_path = cwd / 'gajim' / 'gtk' +logging.basicConfig(level='INFO', format='%(levelname)s: %(message)s') +log = logging.getLogger() + + def cleanup_dir(target_dir: Path) -> None: for path in target_dir.iterdir(): if path.name in IGNORED_FILES: @@ -31,7 +38,7 @@ def link(target: Path) -> None: source = source.replace('gajim/gtk', 'gajim/gui') source = Path(source) source.symlink_to(target) - print('create symlink from', source, 'to', target) + log.info('create symlink from %s -> %s', source, target) def link_files(source_dir: Path) -> None: ===================================== scripts/bump_version.py ===================================== @@ -1,10 +1,11 @@ #!/usr/bin/env python3 -import re import argparse from datetime import datetime from pathlib import Path +import re import subprocess +import sys REPO_DIR = Path(__file__).resolve().parent.parent @@ -23,7 +24,7 @@ def get_current_version() -> str: match = re.search(VERSION_RX, content) if match is None: - exit('Unable to find current version') + sys.exit('Unable to find current version') return match[0] ===================================== scripts/generate_ui_types.py ===================================== @@ -3,15 +3,21 @@ # Reads all .ui files and creates builder.pyi # Excecute this script from the repo root dir +import logging +import sys from io import TextIOWrapper from pathlib import Path -from xml.etree import ElementTree as ET +from xml.etree import ElementTree +logging.basicConfig(level='INFO', format='%(levelname)s: %(message)s') +log = logging.getLogger() + cwd = Path.cwd() if cwd.name != 'gajim': - exit('Script needs to be excecuted from gajim repository root directory') + sys.exit('Script needs to be excecuted from gajim repository ' + 'root directory') in_path = cwd / 'gajim' / 'data' / 'gui' out_path = cwd / 'gajim' / 'gtk' / 'builder.pyi' @@ -45,14 +51,14 @@ def get_builder(file_name: str, widgets: list[str] = ...) -> Builder: ...''' def make_class_name(path: Path) -> str: name = path.name.removesuffix('.ui') names = name.split('_') - names = map(lambda x: x.capitalize(), names) + names = [name.capitalize() for name in names] return ''.join(names) + 'Builder' def parse(path: Path, file: TextIOWrapper) -> str: - print('read', path) + log.info('Read %s', path) lines: list[str] = [] - tree = ET.parse(path) + tree = ElementTree.parse(path) for node in tree.iter(tag='object'): id_ = node.attrib.get('id') if id_ is None: ===================================== scripts/update_translations.py ===================================== @@ -23,7 +23,7 @@ def template_is_equal(old_template_path: Path, new_template: str) -> bool: - with open(old_template_path, 'r', encoding='utf8') as f: + with open(old_template_path, encoding='utf8') as f: old_template = f.read() pattern = r'"POT-Creation-Date: .*\n"' ===================================== setup.py ===================================== @@ -4,6 +4,7 @@ from typing import cast +import logging import os import sys @@ -38,6 +39,10 @@ ALL_LINGUAS = sorted([lang.stem for lang in TRANS_DIR.glob('*.po')]) +logging.basicConfig(level='INFO', format='%(levelname)s: %(message)s') +log = logging.getLogger() + + def newer(source: Path, target: Path) -> bool: if not source.exists(): raise ValueError('file "%s" does not exist' % source.resolve()) @@ -67,7 +72,7 @@ def build_translation() -> None: cwd=REPO_DIR, check=True) - print('Compiling %s >> %s' % (po_file, mo_file)) + log.info('Compiling %s >> %s', po_file, mo_file) def install_trans(data_files: DataFilesT) -> None: @@ -99,7 +104,7 @@ def build_man() -> None: with open(filename, 'rb') as f_in,\ gzip.open(man_file_gz, 'wb') as f_out: f_out.writelines(f_in) - print('Compiling %s >> %s' % (filename, man_file_gz)) + log.info('Compiling %s >> %s', filename, man_file_gz) def install_man(data_files: DataFilesT) -> None: @@ -148,7 +153,7 @@ def merge(in_file: Path, msg = ('ERROR: %s was not merged into the translation files!\n' % out_file) raise SystemExit(msg) - print('Compiling %s >> %s' % (in_file, out_file)) + log.info('Compiling %s >> %s', in_file, out_file) class build(_build): ===================================== win/misc/create-launcher.py ===================================== @@ -50,8 +50,9 @@ def get_build_args() -> list[str]: def build_exe(source_path: str, resource_path: str, - is_gui: bool, - out_path: str) -> None: + out_path: str, + *, + is_gui: bool) -> None: args = ['gcc', '-s'] if is_gui: @@ -61,7 +62,7 @@ def build_exe(source_path: str, subprocess.check_call(args) -def get_launcher_code(debug: bool) -> str: +def get_launcher_code(*, debug: bool) -> str: template = '''\ #include "Python.h" #define WIN32_LEAN_AND_MEAN @@ -166,8 +167,9 @@ def build_launcher(out_path: str, product_name: str, product_version: str, company_name: str, + *, is_gui: bool, - debug: bool = False) -> None: + debug: bool) -> None: src_ico = os.path.abspath(icon_path) target = os.path.abspath(out_path) @@ -179,7 +181,7 @@ def build_launcher(out_path: str, try: os.chdir(temp) with open('launcher.c', 'w') as h: - h.write(get_launcher_code(debug)) + h.write(get_launcher_code(debug=debug)) shutil.copyfile(src_ico, 'launcher.ico') with open('launcher.rc', 'w') as h: h.write(get_resouce_code( @@ -187,7 +189,7 @@ def build_launcher(out_path: str, 'launcher.ico', product_name, product_version, company_name)) build_resource('launcher.rc', 'launcher.res') - build_exe('launcher.c', 'launcher.res', is_gui, target) + build_exe('launcher.c', 'launcher.res', target, is_gui=is_gui) finally: os.chdir(dir_) shutil.rmtree(temp) @@ -205,12 +207,12 @@ def main() -> None: build_launcher( os.path.join(target, 'Gajim.exe'), os.path.join(misc, 'gajim.ico'), 'Gajim', 'Gajim', - version, company_name, True) + version, company_name, is_gui=True, debug=False) build_launcher( os.path.join(target, 'Gajim-Debug.exe'), os.path.join(misc, 'gajim.ico'), 'Gajim', 'Gajim', - version, company_name, False, debug=True) + version, company_name, is_gui=False, debug=True) # build_launcher( # os.path.join(target, "history_manager.exe"), ===================================== win/misc/depcheck.py ===================================== @@ -12,12 +12,16 @@ import subprocess import os import sys +import logging from typing import Optional import gi gi.require_version('GIRepository', '2.0') from gi.repository import GIRepository # noqa: E402 +logging.basicConfig(level='INFO', format='%(levelname)s: %(message)s') +log = logging.getLogger() + def get_required_by_typelibs() -> set[str]: deps: set[str] = set() @@ -49,7 +53,7 @@ def get_dependencies(filename: str) -> list[str]: try: data = subprocess.getoutput('objdump -p %s' % filename) except Exception as error: - print(error) + log.error(error) return deps for line in data.splitlines(): @@ -79,12 +83,12 @@ def get_things_to_delete(root: str) -> list[str]: all_libs.add(lib) needed.add(lib) if find_lib(root, lib) is None: - print('MISSING:', path, lib) + log.info('MISSING: %s %s', path, lib) for lib in get_required_by_typelibs(): needed.add(lib) if find_lib(root, lib) is None: - print('MISSING:', lib) + log.info('MISSING: %s', lib) result: list[str] = [] libs = all_libs - needed @@ -106,7 +110,7 @@ def main() -> None: libs = get_things_to_delete(sys.prefix) while libs: for lib in libs: - print('DELETE:', lib) + log.info('DELETE: %s', lib) os.unlink(lib) libs = get_things_to_delete(sys.prefix) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3d5363d060ddb5fbf9814e9bed4800f0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3d5363d060ddb5fbf9814e9bed4800f0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cq: Ignore flake8 unused-import errors
by Philipp Hörist (＠lovetox) 03 Dec '22

03 Dec '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2bbcd18b by Philipp Hörist at 2022-12-03T22:26:27+01:00 cq: Ignore flake8 unused-import errors - - - - - 1 changed file: - gajim/common/app.py Changes: ===================================== gajim/common/app.py ===================================== @@ -53,8 +53,8 @@ from gajim.common.const import Display if typing.TYPE_CHECKING: - from gajim.gui.main import MainWindow - from gajim.gui.application import GajimApplication + from gajim.gui.main import MainWindow # noqa + from gajim.gui.application import GajimApplication # noqa from gajim.common.storage.cache import CacheStorage from gajim.common.storage.archive import MessageArchiveStorage from gajim.common.storage.events import EventStorage @@ -63,7 +63,7 @@ from gajim.common.call_manager import CallManager from gajim.common.preview import PreviewManager from gajim.common.task_manager import TaskManager - from gajim.common.commands import ChatCommands + from gajim.common.commands import ChatCommands # noqa interface = cast(types.InterfaceT, None) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2bbcd18bbe9609d8155c5988076aa400… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2bbcd18bbe9609d8155c5988076aa400… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: cq: Remove newline
by Philipp Hörist (＠lovetox) 03 Dec '22

03 Dec '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3becd516 by Philipp Hörist at 2022-12-03T21:46:07+01:00 cq: Remove newline - - - - - 0e53991c by Philipp Hörist at 2022-12-03T22:16:46+01:00 cq: Fix typing for cairo.Context - - - - - 4 changed files: - .ci/make_release.py - gajim/gtk/avatar.py - gajim/gtk/avatar_selector.py - gajim/gtk/types.py Changes: ===================================== .ci/make_release.py ===================================== @@ -44,7 +44,6 @@ def create_release(project: Project, version: str) -> None: parser.add_argument('token', type=str, help='The API token') args = parser.parse_args() - api = Gitlab(GITLAB_INSTANCE_URL, private_token=args.token) api.auth() project = api.projects.get(PROJECT_ID) ===================================== gajim/gtk/avatar.py ===================================== @@ -106,7 +106,7 @@ def generate_avatar(letters: str, context.set_operator(cairo.Operator.OVER) PangoCairo.show_layout(context, layout) - return context.get_target() # pyright: ignore + return context.get_target() @lru_cache(maxsize=None) @@ -183,7 +183,7 @@ def add_status_to_avatar(surface: cairo.ImageSurface, context.set_line_width(clip_radius / 4) context.stroke() - return context.get_target() # pyright: ignore + return context.get_target() @lru_cache(maxsize=128) @@ -220,7 +220,7 @@ def get_show_circle(show: Union[str, types.PresenceShowT], context.set_line_width(size / 10) context.stroke() - return context.get_target() # pyright: ignore + return context.get_target() def fit(surface: cairo.ImageSurface, size: int) -> cairo.ImageSurface: @@ -243,7 +243,7 @@ def fit(surface: cairo.ImageSurface, size: int) -> cairo.ImageSurface: context.scale(factor, factor) context.set_source_surface(square_surface, 0, 0) context.paint() - return context.get_target() # pyright: ignore + return context.get_target() def square(surface: cairo.ImageSurface, size: int) -> cairo.ImageSurface: @@ -267,7 +267,7 @@ def square(surface: cairo.ImageSurface, size: int) -> cairo.ImageSurface: context.set_source_surface(surface, x_pos, y_pos) context.paint() - return context.get_target() # pyright: ignore + return context.get_target() def clip(surface: cairo.ImageSurface, mode: str) -> cairo.ImageSurface: @@ -297,7 +297,7 @@ def clip_circle(surface: cairo.ImageSurface) -> cairo.ImageSurface: context.clip() context.paint() - return context.get_target() # pyright: ignore + return context.get_target() def round_corners(surface: cairo.ImageSurface) -> cairo.ImageSurface: @@ -328,7 +328,7 @@ def round_corners(surface: cairo.ImageSurface) -> cairo.ImageSurface: context.paint() - return context.get_target() # pyright: ignore + return context.get_target() def convert_to_greyscale(surface: cairo.ImageSurface) -> cairo.ImageSurface: @@ -341,7 +341,7 @@ def convert_to_greyscale(surface: cairo.ImageSurface) -> cairo.ImageSurface: context.set_source_rgba(1, 1, 1, 0.5) context.rectangle(0, 0, surface.get_width(), surface.get_height()) context.fill() - return context.get_target() # pyright: ignore + return context.get_target() class AvatarStorage(metaclass=Singleton): ===================================== gajim/gtk/avatar_selector.py ===================================== @@ -34,6 +34,7 @@ from gajim.common.i18n import _ from gajim.common.helpers import get_file_path_from_dnd_dropped_uri +from . import types from .dialogs import ErrorDialog from .filechoosers import AvatarChooserDialog from .util import scale_with_ratio @@ -286,7 +287,11 @@ def get_pixbuf(self) -> Optional[GdkPixbuf.Pixbuf]: return GdkPixbuf.Pixbuf.new_subpixbuf( self._browse_pixbuf, self._crop.x, self._crop.y, width, height) - def _on_draw(self, _widget: Gtk.Widget, context: cairo.Context) -> bool: + def _on_draw(self, + _widget: Gtk.Widget, + context: cairo.Context[types.SomeSurface] + ) -> bool: + if self._browse_pixbuf is None: return False ===================================== gajim/gtk/types.py ===================================== @@ -16,6 +16,9 @@ from typing import Union from typing import TYPE_CHECKING +from typing import TypeVar + +import cairo if TYPE_CHECKING: @@ -39,3 +42,5 @@ ControlT = Union['ChatControl'] ConversationViewT = Union['ConversationView'] + +SomeSurface = TypeVar('SomeSurface', bound=cairo.Surface) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/52816f7f56526fce1da12692556aea7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/52816f7f56526fce1da12692556aea7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Automatically create Gitlab Release
by Philipp Hörist (＠lovetox) 03 Dec '22

03 Dec '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 52816f7f by Philipp Hörist at 2022-12-03T21:10:11+01:00 ci: Automatically create Gitlab Release - - - - - 2 changed files: - + .ci/make_release.py - .gitlab-ci.yml Changes: ===================================== .ci/make_release.py ===================================== @@ -0,0 +1,53 @@ +#!/usr/bin/env python + +from __future__ import annotations + +import argparse +import logging + +from gitlab import Gitlab +from gitlab.v4.objects import Project + + +logging.basicConfig(level='INFO', format='%(levelname)s: %(message)s') +log = logging.getLogger() + + +GITLAB_INSTANCE_URL = 'https://dev.gajim.org' +PROJECT_ID = 31 + + +def adjust_milestones(project: Project, version: str) -> None: + log.info('Rename Milestone: Next Release -> %s', version) + milestones = project.milestones.list(title='Next Release', get_all=True) + assert isinstance(milestones, list) + milestone = milestones[0] + milestone.title = version + milestone.save() + + log.info('Create Milestone: Next Release') + project.milestones.create({'title': 'Next Release'}) + + +def create_release(project: Project, version: str) -> None: + log.info('Create Release: %s', version) + project.releases.create({ + 'name': version, + 'tag_name': version, + 'milestones': [version], + }) + + +if __name__ == '__main__': + parser = argparse.ArgumentParser(description='Make Gitlab Release') + parser.add_argument('version', type=str, help='The new version string') + parser.add_argument('token', type=str, help='The API token') + args = parser.parse_args() + + + api = Gitlab(GITLAB_INSTANCE_URL, private_token=args.token) + api.auth() + project = api.projects.get(PROJECT_ID) + + adjust_milestones(project, args.version) + create_release(project, args.version) ===================================== .gitlab-ci.yml ===================================== @@ -160,3 +160,4 @@ publish-release: - git add -u - git commit -m "Release Gajim $CI_COMMIT_TAG" - git push + - .ci/make_release.py $CI_COMMIT_TAG "${PROJECT_TOKEN}" View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/52816f7f56526fce1da12692556aea70… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/52816f7f56526fce1da12692556aea70… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted tag show
by Philipp Hörist (＠lovetox) 03 Dec '22

03 Dec '22

Philipp Hörist deleted tag show at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new tag show
by Philipp Hörist (＠lovetox) 03 Dec '22

03 Dec '22

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

1 0

[Git][gajim/gajim] Pushed new tag 1.5.4
by Philipp Hörist (＠lovetox) 03 Dec '22

03 Dec '22

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

1 0

[Git][gajim/gajim][master] release: 1.5.4
by Philipp Hörist (＠lovetox) 03 Dec '22

03 Dec '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4d501a60 by Philipp Hörist at 2022-12-03T10:20:01+01:00 release: 1.5.4 - - - - - 4 changed files: - ChangeLog - data/org.gajim.Gajim.appdata.xml.in - flatpak/org.gajim.Gajim.yaml - gajim/__init__.py Changes: ===================================== ChangeLog ===================================== @@ -1,3 +1,62 @@ +Gajim 1.5.4 (04 Dec 2022) + + Improvements + + * DataFormWidget: Set min width on right box (#11222) + * MUC: Add method for aborting join + * Message selection: Imrpove wording for deselecting messages + * Message selection: Improve styling + * Features: Add entry for Audio Preview + * Styling: Introduce URI scheme whitelisting (#11266) + * Message selection: Use date_time_format instead of time_format + * Settings: Unify timestamp settings (#10948) + * Prettify display of geographical locations + * ChatList: Scroll to top when switching workspace + * Preferences: Improve preview settings + * Chatstates: Add a timeout for the "composing" animation + * Accounts window: Use equal widths for account switch label + * VCardGrid: Linkify all URI-type fields iff they are valid URIs + * URI parsing: Detect invalid file URIs earlier + * Styling: Validate link syntax deeper and *after* parenthesis correction + * Add msg_log_id to live message events (#11263) + + Change + + * Dependencies: Remove pyOpenSSL, add python-cryptography + * Jingle: Remove XTLS support (#11160) + * Add FileTransferSelector as a central page for sending files (#9511) + * Block opening file:/ links by default (#11276) + + Performance + + * Control: Request history more efficiently + + Bug Fixes + + * Preview: Handle multiple simultaneous certificate verification errors + * Styling: Linkify URIs only if at the start of a word + * MessageInputTextView: Reintroduce gui_extension_point + * GUI tests: Adapt GUI tests to Gajim changes + * SSLErrorDialog: Fix test, remove OpenSSL usage + * ChatFunctionPage: Don't close control on cancelling join error (#11116) + * SearchView: Set chat type correctly for ResultRows (#11087) + * Chatstates: Switch to Chatstate.ACTIVE after timeout + * GroupchatRoster: Set visibility when hiding + * MessageActionsBox: Reintroduce gui_extension_point + * Preview: Respect MUC context for PMs (#11289) + * ConversationView: Fix scrollbar not being the right-most widget + * Preview: Stop further processing if decompression bomb detected (#11280) + * URI parsing: More robustness with geo URIs + * URI parsing: Properly unescape mailto URIs + * URI parsing: Properly unescape XMPP URIs and handle unknown query types + * MessageInputTextView: Handle is_correcting if no contact is set (#11272) + * Fix various issues with chat markers + * Plugins: Replace usage of gui_extention_point() + * CSS: Fix settings related inconsistencies + * CSS: Move overriding rules to bottom (#11269) + * Message selection: Don’t fail hard if log_line_id is None (#11263) + * Don’t fail when trying to reset last message id + Gajim 1.5.3 (31 Oct 2022) New ===================================== data/org.gajim.Gajim.appdata.xml.in ===================================== @@ -74,6 +74,7 @@ <control>pointing</control> </recommends> <releases> + <release version="1.5.4" date="2022-12-03" /> <release version="1.5.3" date="2022-10-31" /> <release version="1.5.2" date="2022-10-08" /> <release version="1.5.1" date="2022-09-19" /> ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -321,7 +321,7 @@ modules: sources: - type: git url: https://dev.gajim.org/gajim/gajim.git - tag: 1.5.3 + tag: 1.5.4 - type: file path: app-overrides.json post-install: ===================================== gajim/__init__.py ===================================== @@ -1,7 +1,7 @@ import sys from pathlib import Path -__version__ = '1.5.3' +__version__ = '1.5.4' IS_FLATPAK = Path('/app/share/run-as-flatpak').exists() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4d501a607fd4cedfc7befae013486df3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4d501a607fd4cedfc7befae013486df3… 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