Commits April 2022

commits@gajim.org

1 participants
43 discussions

[Git][gajim/gajim][master] ci: Update pyrightconfig.json
by Philipp Hörist (＠lovetox) 02 Apr '22

02 Apr '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 11d09cc4 by lovetox at 2022-04-02T19:43:13+02:00 ci: Update pyrightconfig.json - - - - - 1 changed file: - pyrightconfig.json Changes: ===================================== pyrightconfig.json ===================================== @@ -4,6 +4,7 @@ "typeCheckingMode": "strict", "reportImportCycles": "none", "reportImplicitStringConcatenation": "none", + "reportMissingModuleSource": "none", "exclude": [ "**/__pycache__", ".git" View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/11d09cc4a178cabcea0c102b538f17fb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/11d09cc4a178cabcea0c102b538f17fb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 3 commits: ci: Move pylint check into own script
by Philipp Hörist (＠lovetox) 02 Apr '22

02 Apr '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: f2189e13 by lovetox at 2022-04-02T16:24:58+02:00 ci: Move pylint check into own script - - - - - a55e844c by lovetox at 2022-04-02T16:59:11+02:00 refactor: Remove unused attribute - - - - - e80c9325 by lovetox at 2022-04-02T17:04:48+02:00 ci: Fix Pylint errors - - - - - 18 changed files: - + .ci/pylint-test.py - .gitlab-ci.yml - nbxmpp/auth.py - nbxmpp/client.py - nbxmpp/errors.py - nbxmpp/idlequeue.py - nbxmpp/modules/blocking.py - nbxmpp/modules/discovery.py - nbxmpp/modules/muc/muc.py - nbxmpp/modules/omemo.py - nbxmpp/modules/ping.py - nbxmpp/modules/security_labels.py - nbxmpp/modules/user_avatar.py - nbxmpp/modules/vcard4.py - nbxmpp/old_dispatcher.py - nbxmpp/simplexml.py - nbxmpp/structs.py - nbxmpp/task.py Changes: ===================================== .ci/pylint-test.py ===================================== @@ -0,0 +1,44 @@ +#!/usr/bin/env python3 + +import sys +import subprocess + +DISABLED_CHECKS = [ + 'C0103', # invalid-name + 'C0201', # consider-iterating-dictionary + 'C0206', # consider-using-f-string + 'C0209', # consider-using-dict-items + 'C0301', # line-too-long + 'C0326', # bad-whitespace + 'C0330', # bad-continuation + 'W0201', # attribute-defined-outside-init + 'W0212', # protected-access + 'W0221', # arguments-differ + 'W0231', # super-init-not-called + 'W0233', # non-parent-init-called + 'W0621', # redefined-outer-name + 'W0622', # redefined-builtin + 'W0707', # raise-missing-from + 'R0201', # no-self-use + 'R0801', # duplicate-code + 'E1101', # no-member + 'E1135', # unsupported-membership-test +] + + +def run_pylint_test(): + + cmd = [ + 'pylint', + 'nbxmpp', + f'--disable={",".join(DISABLED_CHECKS)}' + ] + + try: + subprocess.run(cmd, check=True) + except subprocess.CalledProcessError: + sys.exit('pylint test failed') + + +if __name__ == '__main__': + run_pylint_test() ===================================== .gitlab-ci.yml ===================================== @@ -7,7 +7,7 @@ stages: run-test: stage: test script: - - python3 -m pylint nbxmpp --disable=C0103,C0201,C0209,C0301,C0326,C0330,W0201,W0212,W0221,W0231,W0233,W0621,W0622,W0707,R0201,R0801,E1101,E1135 + - python3 .ci/pylint-test.py - coverage run --source=nbxmpp -m unittest discover -v - coverage report -mi - coverage xml -i @@ -16,25 +16,6 @@ run-test: reports: cobertura: coverage.xml -# C0103 invalid-name -# C0201 consider-iterating-dictionary -# C0209 consider-using-f-string -# C0301 line-too-long -# C0326 bad-whitespace -# C0330 bad-continuation -# W0201 attribute-defined-outside-init -# W0212 protected-access -# W0221 arguments-differ -# W0231 super-init-not-called -# W0233 non-parent-init-called -# W0621 redefined-outer-name -# W0622 redefined-builtin -# W0707 raise-missing-from -# R0201 no-self-use -# R0801 duplicate-code -# E1101 no-member -# E1135 unsupported-membership-test - run-build: stage: build script: ===================================== nbxmpp/auth.py ===================================== @@ -155,7 +155,7 @@ class SASL: elif chosen_mechanism == 'ANONYMOUS': self._method = ANONYMOUS(self._client) - self._method.initiate() + self._method.initiate() # pylint: disable=E1120 elif chosen_mechanism == 'EXTERNAL': self._method = EXTERNAL(self._client) @@ -168,7 +168,7 @@ class SASL: else: hostname = self._client.domain try: - self._method.initiate(hostname) + self._method.initiate(hostname) # pylint: disable=E1120 except AuthFail as error: self._log.error(error) self._abort_auth() @@ -300,7 +300,7 @@ class GSSAPI: if not self.ctx.complete: output_token = self.ctx.step(server_message) else: - result = self.ctx.unwrap(server_message) + _result = self.ctx.unwrap(server_message) # TODO(jelmer): Log result.message data = b'\x00\x00\x00\x00' + bytes(self.ctx.initiator_name) output_token = self.ctx.wrap(data, False).message ===================================== nbxmpp/client.py ===================================== @@ -479,8 +479,8 @@ class Client(Observable): else: self._set_error(StreamError.CONNECTION_FAILED, 'connection-failed', - (f'Unable to connect to last ' - 'successful address: {self._current_address}')) + ('Unable to connect to last ' + f'successful address: {self._current_address}')) self.notify('connection-failed') def _disconnect_with_error(self, error_domain, error, text=None): ===================================== nbxmpp/errors.py ===================================== @@ -36,7 +36,7 @@ class BaseError(Exception): def __str__(self) -> str: return self.text - def get_text(self, pref_lang: Optional[str] = None) -> str: + def get_text(self, _pref_lang: Optional[str] = None) -> str: return self.text ===================================== nbxmpp/idlequeue.py ===================================== @@ -170,6 +170,8 @@ class IdleCommand(IdleObject): def _start_nt(self): # if program is started from noninteraactive shells stdin is closed and # cannot be forwarded, so we have to keep it open + + # pylint: disable=consider-using-with self.pipe = subprocess.Popen(self._compose_command_args(), stdout=subprocess.PIPE, bufsize=1024, ===================================== nbxmpp/modules/blocking.py ===================================== @@ -17,8 +17,7 @@ from __future__ import annotations -from typing import Literal, Optional -from typing import Union +from typing import Optional from typing import Set from typing import TYPE_CHECKING ===================================== nbxmpp/modules/discovery.py ===================================== @@ -57,7 +57,7 @@ class Discovery(BaseModule): ] @staticmethod - def _process_disco_info(client, stanza, properties): + def _process_disco_info(client, stanza, _properties): iq = stanza.buildReply('error') iq.addChild(node=ErrorNode(ERR_ITEM_NOT_FOUND)) client.send_stanza(iq) ===================================== nbxmpp/modules/muc/muc.py ===================================== @@ -208,7 +208,7 @@ class MUC(BaseModule): if address is not None: properties.muc_ofrom = JID.from_string(address.getAttr('jid')) - def _process_message_after_decryption(self, _client, stanza, properties): + def _process_message_after_decryption(self, _client, _stanza, properties): if properties.body is None and properties.subject: properties.muc_subject = MucSubject( text=properties.subject, @@ -444,7 +444,7 @@ class MUC(BaseModule): @iq_request_task def request_config(self, room_jid): - task = yield + _task = yield response = yield make_config_request(room_jid) if response.isError(): ===================================== nbxmpp/modules/omemo.py ===================================== @@ -189,7 +189,7 @@ def _parse_omemo_message(stanza): try: sid = int(header.getAttr('sid')) - except Exception as error: + except Exception: raise MalformedStanzaError('sid attr not found', stanza) iv_node = header.getTag('iv') ===================================== nbxmpp/modules/ping.py ===================================== @@ -37,7 +37,7 @@ class Ping(BaseModule): priority=15), ] - def _process_ping(self, _client, stanza, properties): + def _process_ping(self, _client, stanza, _properties): self._log.info('Send pong to %s', stanza.getFrom()) iq = stanza.buildSimpleReply('result') self._client.send_stanza(iq) ===================================== nbxmpp/modules/security_labels.py ===================================== @@ -63,7 +63,7 @@ class SecurityLabels(BaseModule): catalog_node = response.getTag('catalog', namespace=Namespace.SECLABEL_CATALOG) - to = catalog_node.getAttr('to') + items = catalog_node.getTags('item') labels = {} ===================================== nbxmpp/modules/user_avatar.py ===================================== @@ -226,7 +226,7 @@ def _get_avatar_data(item, id_): avatar_sha = hashlib.sha1(avatar).hexdigest() if avatar_sha != id_: - raise MalformedStanzaError(f'avatar does not match sha', item) + raise MalformedStanzaError('avatar does not match sha', item) return AvatarData(data=avatar, sha=avatar_sha) ===================================== nbxmpp/modules/vcard4.py ===================================== @@ -15,6 +15,8 @@ # You should have received a copy of the GNU General Public License # along with this program; If not, see <http://www.gnu.org/licenses/>. +# pylint: disable=E1120 + import logging from typing import List ===================================== nbxmpp/old_dispatcher.py ===================================== @@ -290,7 +290,7 @@ class XMPPDispatcher(PlugIn): self._owner.send("%s%s>" % (XML_DECLARATION, str(self._metastream)[:-2])) - def _check_stream_start(self, ns, tag, attrs): + def _check_stream_start(self, ns, tag, _attrs): if ns != Namespace.STREAMS or tag != 'stream': raise ValueError('Incorrect stream start: ' '(%s,%s). Terminating.' % (tag, ns)) ===================================== nbxmpp/simplexml.py ===================================== @@ -592,7 +592,6 @@ class NodeBuilder: _parser: Any Parse: Callable[[str, bool], None] __depth: int - __last_depth: int __max_depth: int _dispatch_depth: int _document_attrs: Optional[Attrs] @@ -634,7 +633,6 @@ class NodeBuilder: self.Parse = self._parser.Parse self.__depth = 0 - self.__last_depth = 0 self.__max_depth = 0 self._dispatch_depth = dispatch_depth self._document_attrs = None @@ -799,12 +797,10 @@ class NodeBuilder: return self.__depth <= level < self.__max_depth def _inc_depth(self) -> None: - self.__last_depth = self.__depth self.__depth += 1 self.__max_depth = max(self.__depth, self.__max_depth) def _dec_depth(self) -> None: - self.__last_depth = self.__depth self.__depth -= 1 def XML2Node(xml_str: str) -> Optional[Node]: ===================================== nbxmpp/structs.py ===================================== @@ -434,6 +434,8 @@ class DiscoInfo(NamedTuple): except Exception: continue + return None + def supports(self, feature: str) -> bool: return feature in self.features ===================================== nbxmpp/task.py ===================================== @@ -322,6 +322,7 @@ class IqRequestTask(Task): self._iq_id = None def _run_async(self, stanza: Node): + # pylint: disable=arguments-renamed self._iq_id = self._client.send_stanza(stanza, callback=self._async_finished, timeout=self._timeout) @@ -358,6 +359,7 @@ class HTTPRequestTask(Task): self._session = session def _run_async(self, message): + # pylint: disable=arguments-renamed self._session.queue_message(message, self._async_finished, None) def _async_finished(self, _session, message, _user_data): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/5f0e1da08f2809f1197c543… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/5f0e1da08f2809f1197c543… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Windows: Build and deploy in one job
by Philipp Hörist (＠lovetox) 02 Apr '22

02 Apr '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: c535bd4d by lovetox at 2022-04-02T15:31:48+02:00 ci: Windows: Build and deploy in one job Passing the artifacts does not work for unknown reasons - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -69,18 +69,19 @@ build-linux: paths: - dist/gajim-*.tar.gz -build-windows: +build-and-deploy-windows: stage: build rules: - if: '$GAJIM_NIGHTLY_BUILD' - if: '$CI_COMMIT_TAG' script: - python3 .ci/appveyor_build.py + - python3 .ci/deploy.py build - artifacts: - expire_in: 1 day - paths: - - build/Gajim-*.exe + # artifacts: + # expire_in: 1 day + # paths: + # - build/Gajim-*.exe deploy-linux: stage: deploy @@ -94,17 +95,17 @@ deploy-linux: script: - python3 .ci/deploy.py dist -deploy-windows: - stage: deploy - needs: ['build-windows'] - rules: - - if: '$GAJIM_NIGHTLY_BUILD' - - if: '$CI_COMMIT_TAG' - when: manual - variables: - DEPLOY_TYPE: "windows" - script: - - python3 .ci/deploy.py build +# deploy-windows: +# stage: deploy +# needs: ['build-windows'] +# rules: +# - if: '$GAJIM_NIGHTLY_BUILD' +# - if: '$CI_COMMIT_TAG' +# when: manual +# variables: +# DEPLOY_TYPE: "windows" +# script: +# - python3 .ci/deploy.py build deploy-flatpak: stage: deploy View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c535bd4dca36f2b4f1a0eed1d09ed502… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c535bd4dca36f2b4f1a0eed1d09ed502… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2022