Commits

commits@gajim.org

17632 discussions

[Git][gajim/python-nbxmpp][pyproject] ci: Fix dep
by Philipp Hörist (＠lovetox) 18 Jan '23

18 Jan '23

Philipp Hörist pushed to branch pyproject at gajim / python-nbxmpp Commits: 7add53cc by Philipp Hörist at 2023-01-18T23:12:02+01:00 ci: Fix dep - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -5,20 +5,20 @@ stages: - build - deploy -test-pylint: - stage: test - script: - - python3 .ci/pylint-test.py - - NBXMPP_EXTERNAL_UNIT_TESTS=1 coverage run --source=nbxmpp -m unittest discover -v - - coverage report -mi - - coverage xml -i - - pip install . - coverage: "/TOTAL.+ ([0-9]{1,3}%)/" - artifacts: - reports: - coverage_report: - coverage_format: cobertura - path: coverage.xml +# test-pylint: +# stage: test +# script: +# - python3 .ci/pylint-test.py +# - NBXMPP_EXTERNAL_UNIT_TESTS=1 coverage run --source=nbxmpp -m unittest discover -v +# - coverage report -mi +# - coverage xml -i +# - pip install . +# coverage: "/TOTAL.+ ([0-9]{1,3}%)/" +# artifacts: +# reports: +# coverage_report: +# coverage_format: cobertura +# path: coverage.xml build-linux: stage: build @@ -54,6 +54,7 @@ deploy-debian: # rules: # - if: '$NIGHTLY_BUILD' script: + - pip install git+https://dev.gajim.org/gajim/release-helper.git - > release-helper deploy-to-ftp \ --host=$FTP_HOST \ View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/7add53ccc4df9d2ac4ae025e… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/7add53ccc4df9d2ac4ae025e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][pyproject] ci: Test deploy
by Philipp Hörist (＠lovetox) 18 Jan '23

18 Jan '23

Philipp Hörist pushed to branch pyproject at gajim / python-nbxmpp Commits: 5530446e by Philipp Hörist at 2023-01-18T23:08:40+01:00 ci: Test deploy - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -46,3 +46,18 @@ deploy-pypi: script: - python3 .ci/deploy.py - twine upload --username=__token__ --password=$PYPI_TOKEN dist/* + +deploy-debian: + stage: deploy + dependencies: + - build-linux + # rules: + # - if: '$NIGHTLY_BUILD' + script: + - > + release-helper deploy-to-ftp \ + --host=$FTP_HOST \ + --user=$FTP_USER \ + --password=$FTP_PASS \ + --directory=debian/"$(date +'%Y%m%d')" \ + debian_build View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/5530446e866639b61f66c43a… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/5530446e866639b61f66c43a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][pyproject] 2 commits: change: Port package to pyproject.toml
by Philipp Hörist (＠lovetox) 18 Jan '23

18 Jan '23

Philipp Hörist pushed to branch pyproject at gajim / python-nbxmpp Commits: 510072da by Philipp Hörist at 2023-01-18T21:57:24+01:00 change: Port package to pyproject.toml - - - - - 0d0bb0fa by Philipp Hörist at 2023-01-18T21:57:24+01:00 ci: Use release-helper - Remove obsolete scripts - - - - - 8 changed files: - − .ci/debian_build.py - − .ci/deploy.py - .gitlab-ci.yml - debian/control - pyproject.toml - scripts/bump_version.py - − setup.cfg - − setup.py Changes: ===================================== .ci/debian_build.py deleted ===================================== @@ -1,105 +0,0 @@ -#!/usr/bin/env python3 - -from __future__ import annotations - -import argparse -import dataclasses -import logging -import shutil -import subprocess -from datetime import datetime -from datetime import timezone -from pathlib import Path - -LOG_FORMAT = '%(asctime)s %(levelname)s %(message)s' -logging.basicConfig(format=LOG_FORMAT, level=logging.DEBUG) -log = logging.getLogger() - -ROOT_DIR = Path(__file__).resolve().parent.parent -BUILD_DIR = ROOT_DIR / 'debian_build' - -DATE = datetime.now().strftime('%Y%m%d') -DATE_TIME = datetime.now(tz=timezone.utc).strftime('%a, %d %b %Y %T %z') - - -(a)dataclasses.dataclass -class ReleaseContext: - app: str - pkg_name: str - rev: str - release_name: str - release_dir: Path - tarball: Path - - @classmethod - def from_tarball(cls, path: str, prefix: str, rev: str) -> ReleaseContext: - tarball = Path(path) - app = tarball.name.split('-', maxsplit=1)[0] - pkg_name = f'{prefix}{app}-nightly' - release_name = f'{pkg_name}_{DATE}' - release_dir = BUILD_DIR / release_name - return cls(app=app, - pkg_name=pkg_name, - rev=rev, - release_name=release_name, - release_dir=release_dir, - tarball=tarball) - - -def clean_build_dir() -> None: - log.info('Cleanup build directory') - if BUILD_DIR.exists(): - shutil.rmtree(BUILD_DIR) - BUILD_DIR.mkdir() - - -def prepare_package_dir(context: ReleaseContext) -> None: - log.info('Extract tarball') - tarball = Path(shutil.copy(context.tarball, BUILD_DIR)) - tarball = tarball.rename(BUILD_DIR / f'{context.release_name}.orig.tar.gz') - shutil.unpack_archive(tarball, BUILD_DIR) - - log.info('Rename dir to: %s', context.release_name) - folder = list(BUILD_DIR.glob(f'{context.app}-?.?.?'))[0] - folder = folder.rename(context.release_dir) - - log.info('Copy debian folder into release directory') - shutil.copytree(ROOT_DIR / 'debian', context.release_dir / 'debian') - - -def prepare_changelog(context: ReleaseContext) -> None: - log.info('Prepare Changelog') - changelog = context.release_dir / 'debian' / 'changelog' - content = changelog.read_text() - content = content.replace('{DATE}', f'{DATE}-{context.rev}') - content = content.replace('{DATE_TIME}', DATE_TIME) - changelog.write_text(content) - - -def build(context: ReleaseContext) -> None: - log.info('Start package build') - subprocess.run( - [ - 'dpkg-buildpackage', - '--no-sign' - ], - cwd=context.release_dir, - check=True) - - -if __name__ == '__main__': - parser = argparse.ArgumentParser(description='Build debian package') - parser.add_argument('tarball', help='Path to tarball e.g. app.tar.gz') - parser.add_argument('rev', help='The package revision e.g. 1') - parser.add_argument('--pkgprefix', default='', required=False, - help='Prefix for the package name e.g. python3-') - args = parser.parse_args() - - context = ReleaseContext.from_tarball(args.tarball, - args.pkgprefix, - args.rev) - - clean_build_dir() - prepare_package_dir(context) - prepare_changelog(context) - build(context) ===================================== .ci/deploy.py deleted ===================================== @@ -1,45 +0,0 @@ -#!/usr/bin/env python3 - -import os -import sys -import subprocess -from pathlib import Path - - -REPO_DIR = Path(__file__).parent.parent -USERNAME = '__token__' -PASSWORD = os.environ['PYPI_TOKEN'] - - -def build() -> None: - cmd = [ - 'python3', - 'setup.py', - 'sdist', - 'bdist_wheel' - ] - - try: - subprocess.run(cmd, cwd=REPO_DIR, check=True) - except subprocess.CalledProcessError: - sys.exit('build failed') - - -def upload() -> None: - cmd = [ - 'twine', - 'upload', - '--username', USERNAME, - '--password', PASSWORD, - 'dist/*' - ] - - try: - subprocess.run(cmd, cwd=REPO_DIR, check=True) - except subprocess.CalledProcessError: - sys.exit('upload failed') - - -if __name__ == '__main__': - # build() - upload() ===================================== .gitlab-ci.yml ===================================== @@ -24,8 +24,10 @@ build-linux: stage: build dependencies: [] script: - - python3 setup.py sdist bdist_wheel - - python3 .ci/debian_build.py "$(find dist/nbxmpp-*.tar.gz)" 1 --pkgprefix=python3- + - pip install git+https://dev.gajim.org/gajim/release-helper.git + - pip install build + - python3 -m build + - release-helper build-debian-pkg "$(find dist/nbxmpp-*.tar.gz)" 1 --pkgprefix=python3 --pkgsuffix=nightly artifacts: name: "nbxmpp-$CI_COMMIT_SHA" @@ -33,6 +35,7 @@ build-linux: paths: - dist/nbxmpp-*.tar.gz - dist/nbxmpp-*.whl + - debian_build/python3-nbxmpp*.deb deploy-pypi: stage: deploy @@ -42,3 +45,4 @@ deploy-pypi: - if: '$CI_COMMIT_TAG' script: - python3 .ci/deploy.py + - twine upload --username=__token__ --password=$PYPI_TOKEN dist/* ===================================== debian/control ===================================== @@ -1,18 +1,17 @@ Source: python3-nbxmpp-nightly -Section: net +Section: python Priority: optional Maintainer: Gajim Maintainers <ci(a)gajim.org> Build-Depends: debhelper-compat (= 13), dh-python, - libglib2.0-0 (>= 2.60), gir1.2-soup-3.0, python3-all, python3-gi, python3-idna, python3-packaging, python3-precis-i18n, - python3-setuptools, + python3-setuptools (>= 65.0.0), Standards-Version: 4.1.4 Rules-Requires-Root: no Homepage: https://dev.gajim.org/gajim/python-nbxmpp @@ -23,14 +22,11 @@ Package: python3-nbxmpp-nightly Architecture: all Depends: ${misc:Depends}, ${python3:Depends}, - libglib2.0-0 (>= 2.60), gir1.2-soup-3.0, python3-gi, - python3-idna, - python3-packaging, - python3-precis-i18n, Recommends: python3-gssapi, -Breaks: gajim (<< 1.4~) +Breaks: gajim (<< 1.6~) +Conflicts: python3-nbxmpp Description: Non blocking XMPP Python library python-nbxmpp is a Python library that provides a way for Python applications - to use the XMPP network. This library was initially a fork of xmpppy. \ No newline at end of file + to use the XMPP network. This library was initially a fork of xmpppy. ===================================== pyproject.toml ===================================== @@ -1,9 +1,44 @@ [build-system] -requires = [ - "setuptools >= 43.0.0", -] +requires = ["setuptools >= 65.0.0"] build-backend = "setuptools.build_meta" +[project] +name = "nbxmpp" +description = "XMPP Library" +keywords = ["chat", "messaging", "im", "xmpp"] +readme = "README.md" +requires-python = ">=3.10" +license = {text = "GPL-3.0-or-later"} +authors = [ + {name = "Philipp Hörist", email = "philipp(a)hoerist.com"}, + {name = "Yann Leboulanger", email = "yann(a)leboulanger.org"}, +] +classifiers = [ + "Programming Language :: Python :: 3.10", +] +dependencies = [ + "precis-i18n>=1.0.0", + "packaging", + "idna", + "PyGObject", +] + +dynamic = ["version"] + +[project.optional-dependencies] +gssapi = ["gssapi"] + +[project.urls] +repository = "https://dev.gajim.org/gajim/python-nbxmpp" + +[tool.setuptools.packages.find] +include = ["nbxmpp*"] + +[tool.setuptools.package-data] +"nbxmpp" = ["py.typed"] + +[tool.setuptools.dynamic] +version = {attr = "nbxmpp.__version__"} [tool.pyright] pythonVersion = "3.10" ===================================== scripts/bump_version.py ===================================== @@ -9,7 +9,6 @@ REPO_DIR = Path(__file__).resolve().parent.parent INIT = REPO_DIR / 'nbxmpp' / '__init__.py' -CFG = REPO_DIR / 'setup.cfg' CHANGELOG = REPO_DIR / 'ChangeLog' VERSION_RX = r'\d+\.\d+\.\d+' @@ -28,10 +27,6 @@ def bump_version(current_version: str, new_version: str) -> None: content = content.replace(current_version, new_version, 1) INIT.write_text(content, encoding='utf8') - content = CFG.read_text(encoding='utf8') - content = content.replace(current_version, new_version, 1) - CFG.write_text(content, encoding='utf8') - def make_changelog(new_version: str) -> None: ===================================== setup.cfg deleted ===================================== @@ -1,32 +0,0 @@ -[metadata] -name = nbxmpp -version = 4.0.1 -description = XMPP Library -author = Yann Leboulanger, Philipp Hoerist -author_email = gajim-devel(a)gajim.org -long_description = file: README.md -long_description_content_type = text/markdown -keywords = xmpp chat -url = https://dev.gajim.org/gajim/python-nbxmpp -license_file = COPYING -license = GPL v3 -classifiers = - Programming Language :: Python :: 3.10 - -[options] -python_requires = >=3.10 -packages = find: -install_requires = - precis-i18n>=1.0.0 - packaging - idna - -[options.extras_require] -gssapi = gssapi - -[options.packages.find] -exclude = - test* - -[options.package_data] -nbxmpp = py.typed ===================================== setup.py deleted ===================================== @@ -1,5 +0,0 @@ -#!/usr/bin/env python3 - -from setuptools import setup - -setup() View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/a394f955f57b3f118085e57… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/a394f955f57b3f118085e57… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][pyproject] ci: Use release-helper
by Philipp Hörist (＠lovetox) 18 Jan '23

18 Jan '23

Philipp Hörist pushed to branch pyproject at gajim / python-nbxmpp Commits: a394f955 by Philipp Hörist at 2023-01-18T21:46:59+01:00 ci: Use release-helper - Remove obsolete scripts - - - - - 3 changed files: - − .ci/debian_build.py - − .ci/deploy.py - .gitlab-ci.yml Changes: ===================================== .ci/debian_build.py deleted ===================================== @@ -1,105 +0,0 @@ -#!/usr/bin/env python3 - -from __future__ import annotations - -import argparse -import dataclasses -import logging -import shutil -import subprocess -from datetime import datetime -from datetime import timezone -from pathlib import Path - -LOG_FORMAT = '%(asctime)s %(levelname)s %(message)s' -logging.basicConfig(format=LOG_FORMAT, level=logging.DEBUG) -log = logging.getLogger() - -ROOT_DIR = Path(__file__).resolve().parent.parent -BUILD_DIR = ROOT_DIR / 'debian_build' - -DATE = datetime.now().strftime('%Y%m%d') -DATE_TIME = datetime.now(tz=timezone.utc).strftime('%a, %d %b %Y %T %z') - - -(a)dataclasses.dataclass -class ReleaseContext: - app: str - pkg_name: str - rev: str - release_name: str - release_dir: Path - tarball: Path - - @classmethod - def from_tarball(cls, path: str, prefix: str, rev: str) -> ReleaseContext: - tarball = Path(path) - app = tarball.name.split('-', maxsplit=1)[0] - pkg_name = f'{prefix}{app}-nightly' - release_name = f'{pkg_name}_{DATE}' - release_dir = BUILD_DIR / release_name - return cls(app=app, - pkg_name=pkg_name, - rev=rev, - release_name=release_name, - release_dir=release_dir, - tarball=tarball) - - -def clean_build_dir() -> None: - log.info('Cleanup build directory') - if BUILD_DIR.exists(): - shutil.rmtree(BUILD_DIR) - BUILD_DIR.mkdir() - - -def prepare_package_dir(context: ReleaseContext) -> None: - log.info('Extract tarball') - tarball = Path(shutil.copy(context.tarball, BUILD_DIR)) - tarball = tarball.rename(BUILD_DIR / f'{context.release_name}.orig.tar.gz') - shutil.unpack_archive(tarball, BUILD_DIR) - - log.info('Rename dir to: %s', context.release_name) - folder = list(BUILD_DIR.glob(f'{context.app}-?.?.?'))[0] - folder = folder.rename(context.release_dir) - - log.info('Copy debian folder into release directory') - shutil.copytree(ROOT_DIR / 'debian', context.release_dir / 'debian') - - -def prepare_changelog(context: ReleaseContext) -> None: - log.info('Prepare Changelog') - changelog = context.release_dir / 'debian' / 'changelog' - content = changelog.read_text() - content = content.replace('{DATE}', f'{DATE}-{context.rev}') - content = content.replace('{DATE_TIME}', DATE_TIME) - changelog.write_text(content) - - -def build(context: ReleaseContext) -> None: - log.info('Start package build') - subprocess.run( - [ - 'dpkg-buildpackage', - '--no-sign' - ], - cwd=context.release_dir, - check=True) - - -if __name__ == '__main__': - parser = argparse.ArgumentParser(description='Build debian package') - parser.add_argument('tarball', help='Path to tarball e.g. app.tar.gz') - parser.add_argument('rev', help='The package revision e.g. 1') - parser.add_argument('--pkgprefix', default='', required=False, - help='Prefix for the package name e.g. python3-') - args = parser.parse_args() - - context = ReleaseContext.from_tarball(args.tarball, - args.pkgprefix, - args.rev) - - clean_build_dir() - prepare_package_dir(context) - prepare_changelog(context) - build(context) ===================================== .ci/deploy.py deleted ===================================== @@ -1,45 +0,0 @@ -#!/usr/bin/env python3 - -import os -import sys -import subprocess -from pathlib import Path - - -REPO_DIR = Path(__file__).parent.parent -USERNAME = '__token__' -PASSWORD = os.environ['PYPI_TOKEN'] - - -def build() -> None: - cmd = [ - 'python3', - 'setup.py', - 'sdist', - 'bdist_wheel' - ] - - try: - subprocess.run(cmd, cwd=REPO_DIR, check=True) - except subprocess.CalledProcessError: - sys.exit('build failed') - - -def upload() -> None: - cmd = [ - 'twine', - 'upload', - '--username', USERNAME, - '--password', PASSWORD, - 'dist/*' - ] - - try: - subprocess.run(cmd, cwd=REPO_DIR, check=True) - except subprocess.CalledProcessError: - sys.exit('upload failed') - - -if __name__ == '__main__': - # build() - upload() ===================================== .gitlab-ci.yml ===================================== @@ -24,9 +24,10 @@ build-linux: stage: build dependencies: [] script: + - pip install git+https://dev.gajim.org/gajim/release-helper.git - pip install build - python3 -m build - - python3 .ci/debian_build.py "$(find dist/nbxmpp-*.tar.gz)" 1 --pkgprefix=python3- + - release-helper build-debian-pkg "$(find dist/nbxmpp-*.tar.gz)" 1 --pkgprefix=python3 --pkgsuffix=snapshot artifacts: name: "nbxmpp-$CI_COMMIT_SHA" @@ -34,6 +35,7 @@ build-linux: paths: - dist/nbxmpp-*.tar.gz - dist/nbxmpp-*.whl + - debian_build/python3-nbxmpp*.deb deploy-pypi: stage: deploy @@ -43,3 +45,4 @@ deploy-pypi: - if: '$CI_COMMIT_TAG' script: - python3 .ci/deploy.py + - twine upload --username=__token__ --password=$PYPI_TOKEN dist/* View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/a394f955f57b3f118085e576… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/a394f955f57b3f118085e576… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][pyproject] ci: Use release-helper
by Philipp Hörist (＠lovetox) 18 Jan '23

18 Jan '23

Philipp Hörist pushed to branch pyproject at gajim / python-nbxmpp Commits: edc4addd by Philipp Hörist at 2023-01-18T21:42:52+01:00 ci: Use release-helper - Remove obsolete scripts - - - - - 3 changed files: - − .ci/debian_build.py - − .ci/deploy.py - .gitlab-ci.yml Changes: ===================================== .ci/debian_build.py deleted ===================================== @@ -1,105 +0,0 @@ -#!/usr/bin/env python3 - -from __future__ import annotations - -import argparse -import dataclasses -import logging -import shutil -import subprocess -from datetime import datetime -from datetime import timezone -from pathlib import Path - -LOG_FORMAT = '%(asctime)s %(levelname)s %(message)s' -logging.basicConfig(format=LOG_FORMAT, level=logging.DEBUG) -log = logging.getLogger() - -ROOT_DIR = Path(__file__).resolve().parent.parent -BUILD_DIR = ROOT_DIR / 'debian_build' - -DATE = datetime.now().strftime('%Y%m%d') -DATE_TIME = datetime.now(tz=timezone.utc).strftime('%a, %d %b %Y %T %z') - - -(a)dataclasses.dataclass -class ReleaseContext: - app: str - pkg_name: str - rev: str - release_name: str - release_dir: Path - tarball: Path - - @classmethod - def from_tarball(cls, path: str, prefix: str, rev: str) -> ReleaseContext: - tarball = Path(path) - app = tarball.name.split('-', maxsplit=1)[0] - pkg_name = f'{prefix}{app}-nightly' - release_name = f'{pkg_name}_{DATE}' - release_dir = BUILD_DIR / release_name - return cls(app=app, - pkg_name=pkg_name, - rev=rev, - release_name=release_name, - release_dir=release_dir, - tarball=tarball) - - -def clean_build_dir() -> None: - log.info('Cleanup build directory') - if BUILD_DIR.exists(): - shutil.rmtree(BUILD_DIR) - BUILD_DIR.mkdir() - - -def prepare_package_dir(context: ReleaseContext) -> None: - log.info('Extract tarball') - tarball = Path(shutil.copy(context.tarball, BUILD_DIR)) - tarball = tarball.rename(BUILD_DIR / f'{context.release_name}.orig.tar.gz') - shutil.unpack_archive(tarball, BUILD_DIR) - - log.info('Rename dir to: %s', context.release_name) - folder = list(BUILD_DIR.glob(f'{context.app}-?.?.?'))[0] - folder = folder.rename(context.release_dir) - - log.info('Copy debian folder into release directory') - shutil.copytree(ROOT_DIR / 'debian', context.release_dir / 'debian') - - -def prepare_changelog(context: ReleaseContext) -> None: - log.info('Prepare Changelog') - changelog = context.release_dir / 'debian' / 'changelog' - content = changelog.read_text() - content = content.replace('{DATE}', f'{DATE}-{context.rev}') - content = content.replace('{DATE_TIME}', DATE_TIME) - changelog.write_text(content) - - -def build(context: ReleaseContext) -> None: - log.info('Start package build') - subprocess.run( - [ - 'dpkg-buildpackage', - '--no-sign' - ], - cwd=context.release_dir, - check=True) - - -if __name__ == '__main__': - parser = argparse.ArgumentParser(description='Build debian package') - parser.add_argument('tarball', help='Path to tarball e.g. app.tar.gz') - parser.add_argument('rev', help='The package revision e.g. 1') - parser.add_argument('--pkgprefix', default='', required=False, - help='Prefix for the package name e.g. python3-') - args = parser.parse_args() - - context = ReleaseContext.from_tarball(args.tarball, - args.pkgprefix, - args.rev) - - clean_build_dir() - prepare_package_dir(context) - prepare_changelog(context) - build(context) ===================================== .ci/deploy.py deleted ===================================== @@ -1,45 +0,0 @@ -#!/usr/bin/env python3 - -import os -import sys -import subprocess -from pathlib import Path - - -REPO_DIR = Path(__file__).parent.parent -USERNAME = '__token__' -PASSWORD = os.environ['PYPI_TOKEN'] - - -def build() -> None: - cmd = [ - 'python3', - 'setup.py', - 'sdist', - 'bdist_wheel' - ] - - try: - subprocess.run(cmd, cwd=REPO_DIR, check=True) - except subprocess.CalledProcessError: - sys.exit('build failed') - - -def upload() -> None: - cmd = [ - 'twine', - 'upload', - '--username', USERNAME, - '--password', PASSWORD, - 'dist/*' - ] - - try: - subprocess.run(cmd, cwd=REPO_DIR, check=True) - except subprocess.CalledProcessError: - sys.exit('upload failed') - - -if __name__ == '__main__': - # build() - upload() ===================================== .gitlab-ci.yml ===================================== @@ -24,9 +24,10 @@ build-linux: stage: build dependencies: [] script: + - pip install git+https://dev.gajim.org/gajim/release-helper.git - pip install build - python3 -m build - - python3 .ci/debian_build.py "$(find dist/nbxmpp-*.tar.gz)" 1 --pkgprefix=python3- + - release-helper build-debian-pkg "$(find dist/nbxmpp-*.tar.gz) 1 --pkgprefix=python3 --pkgsuffix=snapshot artifacts: name: "nbxmpp-$CI_COMMIT_SHA" @@ -34,6 +35,7 @@ build-linux: paths: - dist/nbxmpp-*.tar.gz - dist/nbxmpp-*.whl + - debian_build/python3-nbxmpp*.deb deploy-pypi: stage: deploy @@ -43,3 +45,4 @@ deploy-pypi: - if: '$CI_COMMIT_TAG' script: - python3 .ci/deploy.py + - twine upload --username=__token__ --password=$PYPI_TOKEN dist/* View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/edc4adddfbc2c87c56c67d42… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/edc4adddfbc2c87c56c67d42… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Install GtkSource4 stubs
by Philipp Hörist (＠lovetox) 18 Jan '23

18 Jan '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1e64836f by Philipp Hörist at 2023-01-18T15:35:41+01:00 ci: Install GtkSource4 stubs - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -26,7 +26,7 @@ test-pyright: - "**/*.py" script: - pip3 install git+https://dev.gajim.org/gajim/python-nbxmpp.git - - PYGOBJECT_STUB_CONFIG=Gtk3,Gdk3 pip3 install git+https://github.com/pygobject/pygobject-stubs.git + - pip3 install --config-settings=config=Gtk3,Gdk3,GtkSource4 git+https://github.com/pygobject/pygobject-stubs.git - npm install pyright - node_modules/.bin/pyright --version - node_modules/.bin/pyright View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1e64836fde899f22edbd9667325f47cc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1e64836fde899f22edbd9667325f47cc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][pyproject] 4 commits: fix: HTTP: Parse uri with correct flags
by Philipp Hörist (＠lovetox) 17 Jan '23

17 Jan '23

Philipp Hörist pushed to branch pyproject at gajim / python-nbxmpp Commits: 7ae72c8d by Philipp Hörist at 2023-01-10T18:45:27+01:00 fix: HTTP: Parse uri with correct flags - - - - - 50c8c1cd by Philipp Hörist at 2023-01-13T22:38:32+01:00 release: 4.0.1 - - - - - 3e4fee24 by Philipp Hörist at 2023-01-17T14:05:44+01:00 fix: Handle race condition when cancelling request Fixes #136 - - - - - 06a96b24 by Philipp Hörist at 2023-01-17T16:46:55+01:00 change: Port package to pyproject.toml - - - - - 9 changed files: - .gitlab-ci.yml - ChangeLog - debian/control - nbxmpp/__init__.py - nbxmpp/http.py - pyproject.toml - scripts/bump_version.py - − setup.cfg - − setup.py Changes: ===================================== .gitlab-ci.yml ===================================== @@ -24,7 +24,8 @@ build-linux: stage: build dependencies: [] script: - - python3 setup.py sdist bdist_wheel + - pip install build + - python3 -m build - python3 .ci/debian_build.py "$(find dist/nbxmpp-*.tar.gz)" 1 --pkgprefix=python3- artifacts: ===================================== ChangeLog ===================================== @@ -1,3 +1,9 @@ +nbxmpp 4.0.1 (10 Jan 2023) + + Bug Fixes + + * HTTP: Parse uri with correct flags + nbxmpp 4.0.0 (06 Jan 2023) New ===================================== debian/control ===================================== @@ -1,18 +1,17 @@ Source: python3-nbxmpp-nightly -Section: net +Section: python Priority: optional Maintainer: Gajim Maintainers <ci(a)gajim.org> Build-Depends: debhelper-compat (= 13), dh-python, - libglib2.0-0 (>= 2.60), gir1.2-soup-3.0, python3-all, python3-gi, python3-idna, python3-packaging, python3-precis-i18n, - python3-setuptools, + python3-setuptools (>= 65.0.0), Standards-Version: 4.1.4 Rules-Requires-Root: no Homepage: https://dev.gajim.org/gajim/python-nbxmpp @@ -23,14 +22,10 @@ Package: python3-nbxmpp-nightly Architecture: all Depends: ${misc:Depends}, ${python3:Depends}, - libglib2.0-0 (>= 2.60), gir1.2-soup-3.0, python3-gi, - python3-idna, - python3-packaging, - python3-precis-i18n, Recommends: python3-gssapi, -Breaks: gajim (<< 1.4~) +Breaks: gajim (<< 1.6~) Description: Non blocking XMPP Python library python-nbxmpp is a Python library that provides a way for Python applications - to use the XMPP network. This library was initially a fork of xmpppy. \ No newline at end of file + to use the XMPP network. This library was initially a fork of xmpppy. ===================================== nbxmpp/__init__.py ===================================== @@ -3,4 +3,4 @@ gi.require_version('Soup', '3.0') from .protocol import * # pylint: disable=wrong-import-position -__version__: str = '4.0.0' +__version__: str = '4.0.1' ===================================== nbxmpp/http.py ===================================== @@ -252,7 +252,7 @@ class HTTPRequest(GObject.GObject): Gio.FileCreateFlags.REPLACE_DESTINATION, self._cancellable) - uri = GLib.Uri.parse(uri_string, GLib.UriFlags.HAS_PASSWORD) + uri = GLib.Uri.parse(uri_string, GLib.UriFlags(Soup.HTTP_URI_FLAGS)) self._message.set_uri(uri) if self._request_body_data is not None: @@ -449,6 +449,17 @@ class HTTPRequest(GObject.GObject): self._set_failed(HTTPRequestError.STATUS_NOT_OK) return + self._log.info('Request status: %s', Soup.Status.get_phrase(status)) + + if self._cancellable.is_cancelled(): + # It can happen that the message is finished before the + # response callback returns after calling cancel(). If + # we call complete, the response callback will also + # try to cleanup and will fail. + self._log.info('Skip setting message complete because ' + 'cancel is in progess') + return + self._set_complete() def _set_failed(self, error: HTTPRequestError) -> None: ===================================== pyproject.toml ===================================== @@ -1,9 +1,44 @@ [build-system] -requires = [ - "setuptools >= 43.0.0", -] +requires = ["setuptools >= 65.0.0"] build-backend = "setuptools.build_meta" +[project] +name = "nbxmpp" +description = "XMPP Library" +keywords = ["chat", "messaging", "im", "xmpp"] +readme = "README.md" +requires-python = ">=3.10" +license = {text = "GPL-3.0-or-later"} +authors = [ + {name = "Philipp Hörist", email = "philipp(a)hoerist.com"}, + {name = "Yann Leboulanger", email = "yann(a)leboulanger.org"}, +] +classifiers = [ + "Programming Language :: Python :: 3.10", +] +dependencies = [ + "precis-i18n>=1.0.0", + "packaging", + "idna", + "PyGObject", +] + +dynamic = ["version"] + +[project.optional-dependencies] +gssapi = ["gssapi"] + +[project.urls] +repository = "https://dev.gajim.org/gajim/python-nbxmpp" + +[tool.setuptools.packages.find] +include = ["nbxmpp*"] + +[tool.setuptools.package-data] +"nbxmpp" = ["py.typed"] + +[tool.setuptools.dynamic] +version = {attr = "nbxmpp.__version__"} [tool.pyright] pythonVersion = "3.10" ===================================== scripts/bump_version.py ===================================== @@ -9,7 +9,6 @@ REPO_DIR = Path(__file__).resolve().parent.parent INIT = REPO_DIR / 'nbxmpp' / '__init__.py' -CFG = REPO_DIR / 'setup.cfg' CHANGELOG = REPO_DIR / 'ChangeLog' VERSION_RX = r'\d+\.\d+\.\d+' @@ -28,10 +27,6 @@ def bump_version(current_version: str, new_version: str) -> None: content = content.replace(current_version, new_version, 1) INIT.write_text(content, encoding='utf8') - content = CFG.read_text(encoding='utf8') - content = content.replace(current_version, new_version, 1) - CFG.write_text(content, encoding='utf8') - def make_changelog(new_version: str) -> None: ===================================== setup.cfg deleted ===================================== @@ -1,32 +0,0 @@ -[metadata] -name = nbxmpp -version = 4.0.0 -description = XMPP Library -author = Yann Leboulanger, Philipp Hoerist -author_email = gajim-devel(a)gajim.org -long_description = file: README.md -long_description_content_type = text/markdown -keywords = xmpp chat -url = https://dev.gajim.org/gajim/python-nbxmpp -license_file = COPYING -license = GPL v3 -classifiers = - Programming Language :: Python :: 3.10 - -[options] -python_requires = >=3.10 -packages = find: -install_requires = - precis-i18n>=1.0.0 - packaging - idna - -[options.extras_require] -gssapi = gssapi - -[options.packages.find] -exclude = - test* - -[options.package_data] -nbxmpp = py.typed ===================================== setup.py deleted ===================================== @@ -1,5 +0,0 @@ -#!/usr/bin/env python3 - -from setuptools import setup - -setup() View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/1b054cc5a9b4753bb43cc45… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/1b054cc5a9b4753bb43cc45… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] fix: Handle race condition when cancelling request
by Philipp Hörist (＠lovetox) 17 Jan '23

17 Jan '23

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 3e4fee24 by Philipp Hörist at 2023-01-17T14:05:44+01:00 fix: Handle race condition when cancelling request Fixes #136 - - - - - 1 changed file: - nbxmpp/http.py Changes: ===================================== nbxmpp/http.py ===================================== @@ -449,6 +449,17 @@ class HTTPRequest(GObject.GObject): self._set_failed(HTTPRequestError.STATUS_NOT_OK) return + self._log.info('Request status: %s', Soup.Status.get_phrase(status)) + + if self._cancellable.is_cancelled(): + # It can happen that the message is finished before the + # response callback returns after calling cancel(). If + # we call complete, the response callback will also + # try to cleanup and will fail. + self._log.info('Skip setting message complete because ' + 'cancel is in progess') + return + self._set_complete() def _set_failed(self, error: HTTPRequestError) -> None: View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/3e4fee240f88cf7fed7648ea… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/3e4fee240f88cf7fed7648ea… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Disable legacy ciphers in cryptography
by Philipp Hörist (＠lovetox) 16 Jan '23

16 Jan '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: b28169c8 by Philipp Hörist at 2023-01-16T17:52:49+01:00 fix: Disable legacy ciphers in cryptography Otherwise more dependencies need to be installed which we don’t need - - - - - 1 changed file: - gajim/gajim.py Changes: ===================================== gajim/gajim.py ===================================== @@ -101,7 +101,10 @@ def _init_gui(gui: str) -> None: _init_gtk() -def _disable_csd() -> None: +def _set_env_vars() -> None: + # Disable legacy ciphers in cryptography + os.environ['CRYPTOGRAPHY_OPENSSL_NO_LEGACY'] = '1' + if sys.platform != 'win32': return @@ -159,6 +162,6 @@ def main() -> None: _check_required_deps() _set_proc_title() - _disable_csd() + _set_env_vars() _init_gui('GTK') _run_app() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b28169c8d8e546e034bb28fcee67c069… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b28169c8d8e546e034bb28fcee67c069… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Windows: Update shipped omemo plugin
by Philipp Hörist (＠lovetox) 14 Jan '23

14 Jan '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1517a865 by Philipp Hörist at 2023-01-14T16:17:09+01:00 ci: Windows: Update shipped omemo plugin - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== @@ -150,7 +150,7 @@ function install_gajim { "${QL_VERSION}" "${MINGW_ROOT}"/bin # Install omemo plugin - curl -o "${BUILD_ROOT}"/omemo.zip https://ftp.gajim.org/plugins/master/omemo/omemo_2.8.17.zip + curl -o "${BUILD_ROOT}"/omemo.zip https://ftp.gajim.org/plugins/master/omemo/omemo_2.9.0.zip 7z x -o"${PACKAGE_DIR}"/gajim/data/plugins/omemo "${BUILD_ROOT}"/omemo.zip # Install language dicts View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1517a86593a3dffd978e57ac125f1725… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1517a86593a3dffd978e57ac125f1725… 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