Commits March 2022

commits@gajim.org

1 participants
91 discussions

[Git][gajim/gajim][master] other: Remove obsolete pylint script
by Philipp Hörist (＠lovetox) 27 Mar '22

27 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 41ae13d8 by lovetox at 2022-03-27T18:40:24+02:00 other: Remove obsolete pylint script - - - - - 1 changed file: - − scripts/dev/run-pylint.py Changes: ===================================== scripts/dev/run-pylint.py deleted ===================================== @@ -1,11 +0,0 @@ -#!/usr/bin/env python3 -# Copyright (C) 2006 Nikos Kouremenos <kourem(a)gmail.com> -# Copyright (C) 2016 Yann Leboulanger <asterix AT lagaule.org> - -import os -import sys - -if os.getcwd().endswith('dev'): - os.chdir('../../gajim/') # we were in scripts/dev - -os.system("pylint3 --generated-members= --additional-builtins='_' --disable=C0103,C0111,W0703,W0511,W0142,W0613,R0201,design " + "".join(sys.argv[1:])) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/41ae13d883d7283b9ab1e9715187cec5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/41ae13d883d7283b9ab1e9715187cec5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Update git update hook
by Philipp Hörist (＠lovetox) 27 Mar '22

27 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 40abcc57 by lovetox at 2022-03-27T18:38:14+02:00 ci: Update git update hook - - - - - 1 changed file: - .githooks/update Changes: ===================================== .githooks/update ===================================== @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import annotations @@ -33,7 +33,12 @@ def get_commit_shas(start_ref: str, end_ref: str) -> List[str]: def enforce_message_rules(subject: str) -> None: - tag, subject = subject.split(': ', maxsplit=1) + try: + tag, subject = subject.split(': ', maxsplit=1) + except ValueError: + print('Unknown commit message tag:', subject) + sys.exit(1) + if tag not in ALLOWED_TAGS: print('Unknown commit message tag:', tag) sys.exit(1) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/40abcc5716d238235cf46d90ddffa9bb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/40abcc5716d238235cf46d90ddffa9bb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: ci: Simplify docker image
by Philipp Hörist (＠lovetox) 27 Mar '22

27 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: f605d77e by lovetox at 2022-03-27T18:14:04+02:00 ci: Simplify docker image Every RUN command creates an image layer, so combining the invocations results in less layers - - - - - ba31782c by lovetox at 2022-03-27T18:18:30+02:00 other: Update git update hook Fix syntax errors, this needs to run with python 3.7 - - - - - 2 changed files: - .githooks/update - docker/Dockerfile Changes: ===================================== .githooks/update ===================================== @@ -1,5 +1,10 @@ #!/usr/bin/env python +from __future__ import annotations + +from typing import List +from typing import Tuple + import sys import subprocess @@ -7,7 +12,7 @@ import subprocess ALLOWED_TAGS = ['ci', 'feat', 'fix', 'perf', 'refactor', 'chore', 'other'] -def parse_args() -> tuple[str, str]: +def parse_args() -> Tuple[str, str]: old_ref = sys.argv[2] new_ref = sys.argv[3] return old_ref, new_ref @@ -19,7 +24,7 @@ def get_commit_subject(sha: str) -> str: return data.decode() -def get_commit_shas(start_ref: str, end_ref: str) -> list[str]: +def get_commit_shas(start_ref: str, end_ref: str) -> List[str]: arg = f'{start_ref}..{end_ref}' data = subprocess.check_output(['git', 'rev-list', arg]) text = data.decode() @@ -38,7 +43,7 @@ def enforce_message_rules(subject: str) -> None: sys.exit(1) -def main(args: tuple[str, str]) -> None: +def main(args: Tuple[str, str]) -> None: shas = get_commit_shas(*args) for sha in shas: subject = get_commit_subject(sha) ===================================== docker/Dockerfile ===================================== @@ -2,25 +2,23 @@ FROM python:3.9 ARG DEBIAN_FRONTEND=noninteractive -RUN apt-get update -RUN apt-get install -y apt-utils -RUN apt-get install -y appstream-util -RUN apt-get install -y libgirepository1.0-dev -RUN apt-get install -y gir1.2-gtk-3.0 -RUN apt-get install -y gir1.2-soup-2.4 -RUN apt-get install -y gir1.2-ayatanaappindicator3-0.1 -RUN apt-get install -y gettext -RUN apt-get install -y nodejs -RUN apt-get install -y npm +RUN apt-get update && apt-get install -y \ + apt-utils \ + appstream-util \ + libgirepository1.0-dev \ + gir1.2-gtk-3.0 \ + gir1.2-soup-2.4 \ + gir1.2-ayatanaappindicator3-0.1 \ + gettext \ + nodejs \ + npm \ + && adduser --disabled-password worker -RUN adduser --disabled-password worker WORKDIR /home/worker ENV PATH="/home/worker/.local/bin:${PATH}" USER worker -RUN pip install --upgrade pip - COPY --chown=worker:worker requirements.txt requirements.txt -RUN pip install --no-cache-dir --user -r requirements.txt +RUN pip install --upgrade pip && pip install --no-cache-dir --user -r requirements.txt CMD bash View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ff1f7cbbe2109a24c56546af3fcc945… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ff1f7cbbe2109a24c56546af3fcc945… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Split up test stage jobs
by Philipp Hörist (＠lovetox) 27 Mar '22

27 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: ff1f7cbb by lovetox at 2022-03-27T16:42:08+02:00 ci: Split up test stage jobs - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -10,7 +10,15 @@ stages: - build - deploy -pyright: +test-other: + stage: test + script: + - codespell -I codespell.conf --skip="*__pycache__*,gajim/data/icons,gajim/data/sounds,gajim/data/emoticons" gajim + - python3 setup.py build + - appstream-util validate build/data/org.gajim.Gajim.appdata.xml + interruptible: true + +test-pyright: stage: test rules: - changes: @@ -19,24 +27,28 @@ pyright: - pip3 install git+https://dev.gajim.org/gajim/python-nbxmpp.git - pip3 install git+https://github.com/pygobject/pygobject-stubs.git - npm install pyright - - python3 -V - python3 .ci/link-gtk.py - $(npm bin)/pyright --version - $(npm bin)/pyright interruptible: true -code-quality: +test-pylint: stage: test + rules: + - changes: + - "**/*.py" script: - - python3 -V - pip3 install -I git+https://dev.gajim.org/gajim/python-nbxmpp.git - .ci/pylint.sh --jobs=2 gajim + interruptible: true + +test-unittest: + stage: test + script: + - pip3 install -I git+https://dev.gajim.org/gajim/python-nbxmpp.git - coverage run --source=gajim -m unittest discover -s test -v - coverage report -mi - coverage xml -i - - codespell -I codespell.conf --skip="*__pycache__*,gajim/data/icons,gajim/data/sounds,gajim/data/emoticons" gajim - - python3 setup.py build - - appstream-util validate build/data/org.gajim.Gajim.appdata.xml coverage: "/TOTAL.+ ([0-9]{1,3}%)/" artifacts: reports: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ff1f7cbbe2109a24c56546af3fcc9457… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ff1f7cbbe2109a24c56546af3fcc9457… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Run pyright job only when python files change
by Philipp Hörist (＠lovetox) 27 Mar '22

27 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0155c811 by lovetox at 2022-03-27T16:11:36+02:00 ci: Run pyright job only when python files change - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -12,6 +12,9 @@ stages: pyright: stage: test + rules: + - changes: + - "**/*.py" script: - pip3 install git+https://dev.gajim.org/gajim/python-nbxmpp.git - pip3 install git+https://github.com/pygobject/pygobject-stubs.git View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0155c811c8c300a4a917052e7b3fcaae… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0155c811c8c300a4a917052e7b3fcaae… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Update CONTRIBUTING.md
by Philipp Hörist (＠lovetox) 27 Mar '22

27 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: bffb9218 by lovetox at 2022-03-27T16:04:22+02:00 chore: Update CONTRIBUTING.md - - - - - 1 changed file: - CONTRIBUTING.md Changes: ===================================== CONTRIBUTING.md ===================================== @@ -2,10 +2,28 @@ # Project If you want to create a fork and use an external account (Github, Google) drop us a message at the Gajim support [group chat](xmpp:gajim@conference.gajim.org?join) so we can give you the necessary rights -- master - Development branch -- gajim_1.1 - Stable Gajim 1.1.x branch -- gajim_1.0 - Stable Gajim 1.0.x branch -- gajim_0.16 - Stable Gajim 0.16.x branch +## Versioning + +┌────── Major (Will not change unless we switch GTK version) +│ ┌───── Minor (Changes when new features are introduced +│ │ ┌─── Micro (Used for hotfixes and small changes) +│ │ │ ┌─── Only used while developing +│ │ │ │ +│ │ │ │ +│ │ │ │ +│ │ │ │ +1.3.3-dev1 + +## Branches + +Currently there is only one stable/development branch - master. +The master branch must always be in a releasable state. + +Development for bigger changes need to happen in feature branches or forks. + +Previously the project maintained multiple versions of Gajim in +different stable branches, but from Gajim 1.4.0 on this approach was changed +to lower the maintenance burden and release faster. # Commit Messages View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bffb92182d38b974a9038db94e3822db… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bffb92182d38b974a9038db94e3822db… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Add ci as allowed commit tag
by Philipp Hörist (＠lovetox) 27 Mar '22

27 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 93bd73bb by lovetox at 2022-03-27T15:46:50+02:00 chore: Add ci as allowed commit tag - - - - - 2 changed files: - .githooks/update - CONTRIBUTING.md Changes: ===================================== .githooks/update ===================================== @@ -4,7 +4,7 @@ import sys import subprocess -ALLOWED_TAGS = ['feat', 'fix', 'perf', 'refactor', 'chore', 'other'] +ALLOWED_TAGS = ['ci', 'feat', 'fix', 'perf', 'refactor', 'chore', 'other'] def parse_args() -> tuple[str, str]: ===================================== CONTRIBUTING.md ===================================== @@ -16,6 +16,7 @@ # Commit Messages Every commit message must be prefixed with one of the following tags: +- ci - feat - fix - perf View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/93bd73bb04c1301d00437737d1654e5e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/93bd73bb04c1301d00437737d1654e5e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: CI: Fix typo
by Philipp Hörist (＠lovetox) 27 Mar '22

27 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 05a09c20 by lovetox at 2022-03-27T15:33:31+02:00 chore: CI: Fix typo - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -77,7 +77,7 @@ deploy-linux: variables: DEPLOY_TYPE: "linux" script: - - python3 .ci/deploy.py sdist + - python3 .ci/deploy.py dist deploy-windows: stage: deploy View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/05a09c205c1bbf11160de370a41cb617… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/05a09c205c1bbf11160de370a41cb617… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: CI: Name nightly tarballs different
by Philipp Hörist (＠lovetox) 27 Mar '22

27 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9fa3fb9e by lovetox at 2022-03-27T15:00:55+02:00 chore: CI: Name nightly tarballs different So we can compare them to the currenly running jobs - - - - - 1 changed file: - .ci/deploy.py Changes: ===================================== .ci/deploy.py ===================================== @@ -109,7 +109,7 @@ def deploy_windows_release(ftp: FTP_TLS, filedir: Path) -> None: def deploy_linux_nightly(ftp: FTP_TLS, filedir: Path) -> None: ftp.cwd(LINUX_NIGHTLY_FOLDER) filepath = find_linux_tarball(filedir) - filename = f'gajim-{date.today().isoformat()}.tar.gz' + filename = f'gajim-{date.today().isoformat()}-test.tar.gz' upload_file(ftp, filepath, name=filename) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9fa3fb9e093a13e47c8c2cc6b7f5da3a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9fa3fb9e093a13e47c8c2cc6b7f5da3a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: CI: Add linux deploy jobs
by Philipp Hörist (＠lovetox) 27 Mar '22

27 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1fda4597 by lovetox at 2022-03-27T14:56:05+02:00 chore: CI: Add linux deploy jobs - - - - - 4 changed files: - .ci/deploy.py - .ci/sdist.py - .gitlab-ci.yml - pyrightconfig.json Changes: ===================================== .ci/deploy.py ===================================== @@ -1,17 +1,24 @@ +from typing import Any +from typing import Optional + +import functools import os import sys +from datetime import date from ftplib import FTP_TLS from pathlib import Path -import functools -from typing import Any from rich.console import Console + FTP_URL = 'panoramix.gajim.org' FTP_USER = os.environ['FTP_USER'] FTP_PASS = os.environ['FTP_PASS'] -WINDOWS_NIGHTLY_FOLDER = 'win_snap' +WINDOWS_NIGHTLY_FOLDER = 'downloads/snap/win' +LINUX_NIGHTLY_FOLDER = 'downloads/snap' + +RELEASE_FOLDER_BASE = 'downloads' console = Console() @@ -37,24 +44,44 @@ def get_gajim_tag() -> str: tag = os.environ.get('CI_COMMIT_TAG') if tag is None: exit('No tag found') - return tag.removesuffix('gajim-') + return tag.removeprefix('gajim-') + + +def find_linux_tarball(filedir: Path) -> Path: + files = list(filedir.glob('gajim-*.tar.gz')) + if len(files) != 1: + exit('Unknown files found') + return files[0] def get_dir_list(ftp: FTP_TLS) -> list[str]: return [x[0] for x in ftp.mlsd()] -def ensure_folder_exists(ftp: FTP_TLS, dirname: str) -> None: +def create_release_folder(ftp: FTP_TLS, tag: str) -> None: + ftp.cwd(RELEASE_FOLDER_BASE) + folder = get_release_folder_from_tag(tag) dir_list = get_dir_list(ftp) - if dirname not in dir_list: - ftp.mkd(dirname) + if folder not in dir_list: + ftp.mkd(folder) + ftp.cwd(folder) + + +def upload_all_from_dir(ftp: FTP_TLS, filedir: Path) -> None: + for filepath in filedir.iterdir(): + upload_file(ftp, filepath) + +def upload_file(ftp: FTP_TLS, + filepath: Path, + name: Optional[str] = None) -> None: -def upload_all_from_dir(ftp: FTP_TLS, dir: Path) -> None: - for file_path in dir.iterdir(): - console.print('Upload file', file_path.name) - with open(file_path, 'rb') as f: - ftp.storbinary('STOR ' + file_path.name, f) + if name is None: + name = filepath.name + + console.print('Upload file', filepath.name, 'as', name) + with open(filepath, 'rb') as f: + ftp.storbinary('STOR ' + name, f) def get_deploy_method() -> str: @@ -74,20 +101,25 @@ def deploy_windows_nightly(ftp: FTP_TLS, filedir: Path) -> None: @ftp_connection def deploy_windows_release(ftp: FTP_TLS, filedir: Path) -> None: tag = get_gajim_tag() - folder = get_release_folder_from_tag(tag) - ensure_folder_exists(ftp, folder) - ftp.cwd(folder) + create_release_folder(ftp, tag) upload_all_from_dir(ftp, filedir) @ftp_connection -def deploy_linux_nightly(): - raise NotImplementedError +def deploy_linux_nightly(ftp: FTP_TLS, filedir: Path) -> None: + ftp.cwd(LINUX_NIGHTLY_FOLDER) + filepath = find_linux_tarball(filedir) + filename = f'gajim-{date.today().isoformat()}.tar.gz' + upload_file(ftp, filepath, name=filename) @ftp_connection -def deploy_linux_release(): - raise NotImplementedError +def deploy_linux_release(ftp: FTP_TLS, file: Path) -> None: + tag = get_gajim_tag() + create_release_folder(ftp, tag) + filepath = find_linux_tarball(filedir) + filename = f'gajim-{tag}.tar.gz' + upload_file(ftp, filepath, name=filename) if __name__ == '__main__': ===================================== .ci/sdist.py ===================================== @@ -1,11 +1,16 @@ #!/usr/bin/env python3 import io -import zipfile -import subprocess +import requests import shutil +import subprocess +import zipfile from pathlib import Path -import requests + +from rich.console import Console + +console = Console() + PLUGINS = [ 'plugin_installer', @@ -15,36 +20,37 @@ PLUGINS_FOLDER = Path('./gajim/data/plugins') -def get_plugins_url(plugin): +def get_plugins_url(plugin: str) -> str: return f'{PLUGINS_BASE_URL}/plugins_master_zip/{plugin}.zip' -def extraxt_zip(zip_bytes, path): - print('Extract to', path) +def extraxt_zip(zip_bytes: bytes, path: Path) -> None: + console.print('Extract to', path) with zipfile.ZipFile(io.BytesIO(zip_bytes)) as zip_file: zip_file.extractall(path) -def download_plugins(): +def download_plugins() -> None: PLUGINS_FOLDER.mkdir(parents=True) for plugin in PLUGINS: url = get_plugins_url(plugin) - print('Download', url) + console.print('Download', url) req = requests.get(url) req.raise_for_status() extraxt_zip(req.content, PLUGINS_FOLDER) -def setup(): - print('Setup') +def setup() -> None: + console.print('Setup') subprocess.call(['python3', 'setup.py', 'sdist']) -def cleanup(): - print('Cleanup') +def cleanup() -> None: + console.print('Cleanup') shutil.rmtree(PLUGINS_FOLDER) -download_plugins() -setup() -cleanup() +if __name__ == '__main__': + download_plugins() + setup() + cleanup() ===================================== .gitlab-ci.yml ===================================== @@ -45,7 +45,6 @@ build-linux: rules: - if: '$GAJIM_NIGHTLY_BUILD' - if: '$CI_COMMIT_TAG' - when: manual script: - python3 .ci/sdist.py @@ -68,6 +67,18 @@ build-windows: paths: - build/Gajim-*.exe +deploy-linux: + stage: deploy + needs: ['build-linux'] + rules: + - if: '$GAJIM_NIGHTLY_BUILD' + - if: '$CI_COMMIT_TAG' + when: manual + variables: + DEPLOY_TYPE: "linux" + script: + - python3 .ci/deploy.py sdist + deploy-windows: stage: deploy needs: ['build-windows'] ===================================== pyrightconfig.json ===================================== @@ -4,7 +4,12 @@ "typeCheckingMode": "strict", "reportImportCycles": "none", "reportImplicitStringConcatenation": "none", + "exclude": [ + "**/__pycache__", + ".git" + ], "include": [ + ".ci/*", "gajim/gajim.py", "gajim/common/application.py", "gajim/common/cert_store.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1fda4597a0f9695cd27ef605e4a3f600… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1fda4597a0f9695cd27ef605e4a3f600… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2022