From 1e4579cdcf858674d25d8c54cfdd02728c4c096a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Mon, 4 Sep 2023 11:06:40 +0000 Subject: [PATCH 1/6] Rely on setuptools_gettext --- .bzrignore | 1 + pyproject.toml | 2 +- setup.py | 18 ------------------ 3 files changed, 2 insertions(+), 19 deletions(-) diff --git a/.bzrignore b/.bzrignore index 97306129fb..7f8ceba89c 100644 --- a/.bzrignore +++ b/.bzrignore @@ -81,3 +81,4 @@ __pycache__ ./target ./Cargo.lock ./brz +locale diff --git a/pyproject.toml b/pyproject.toml index cb5beebf1b..604e50c36c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,7 @@ requires = [ "setuptools>=60", "setuptools-rust", - "setuptools-gettext", + "setuptools-gettext>=0.1.4", "cython>=0.29", ] build-backend = "setuptools.build_meta" diff --git a/setup.py b/setup.py index 93aa53f1ee..41480f35e4 100755 --- a/setup.py +++ b/setup.py @@ -6,7 +6,6 @@ './setup.py --help' for more options """ -import glob import os import os.path import sys @@ -24,19 +23,6 @@ sys.exit(1) -try: - import setuptools_gettext -except ModuleNotFoundError as e: - sys.stderr.write("[ERROR] Please install setuptools_gettext (%s)\n" % e) - sys.exit(1) - -I18N_FILES = [] -for filepath in glob.glob("breezy/locale/*/LC_MESSAGES/*.mo"): - langfile = filepath[len("breezy/locale/"):] - targetpath = os.path.dirname(os.path.join("share/locale", langfile)) - I18N_FILES.append((targetpath, [filepath])) - - from setuptools import setup try: @@ -46,8 +32,6 @@ from distutils.command.build_scripts import build_scripts from distutils.command.install import install -from distutils.command.install_data import install_data -from distutils.command.install_scripts import install_scripts from setuptools import Command @@ -216,8 +200,6 @@ def add_cython_extension(module_name, libraries=None, extra_source=[]): build.sub_commands.append(('build_man', lambda _: True)) DATA_FILES = [('man/man1', ['brz.1', 'breezy/git/git-remote-bzr.1'])] -DATA_FILES = DATA_FILES + I18N_FILES - import site site.ENABLE_USER_SITE = "--user" in sys.argv From d206a54af4040025561cc9159fa5559c14a7ef46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Mon, 4 Sep 2023 17:08:39 +0000 Subject: [PATCH 2/6] Release 3.3.4 --- breezy/__init__.py | 2 +- doc/en/release-notes/brz-3.3.txt | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/breezy/__init__.py b/breezy/__init__.py index a409299e6e..88fbcfecfa 100644 --- a/breezy/__init__.py +++ b/breezy/__init__.py @@ -50,7 +50,7 @@ # Python version 2.0 is (2, 0, 0, 'final', 0)." Additionally we use a # releaselevel of 'dev' for unreleased under-development code. -version_info = (3, 3, 4, 'dev', 0) +version_info = (3, 3, 4, 'final', 0) def _format_version_tuple(version_info): diff --git a/doc/en/release-notes/brz-3.3.txt b/doc/en/release-notes/brz-3.3.txt index 84d41c36f5..6c8291ad73 100644 --- a/doc/en/release-notes/brz-3.3.txt +++ b/doc/en/release-notes/brz-3.3.txt @@ -8,7 +8,17 @@ Breezy Release Notes brz 3.3.4 ######### -:3.3.4: UNRELEASED +:3.3.4: 2023-09-04 + +* Improve handling of lp: URLs when lp: insteadOf is set in gitconfig. + (Jelmer Vernooij) + +* Allow setting _ConnectRequestor.selector. (Jelmer Vernooij) + +* Fix brz-email bug on Python 3. (Triss) + +* Fix compatibility with newer versions of dulwich. + (Jelmer Vernooij) brz 3.3.3 ######### From c86d8f66c141450bb38fffd84b33bc42a75ca88d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Mon, 4 Sep 2023 17:12:03 +0000 Subject: [PATCH 3/6] Start on 3.3.5 --- Cargo.toml | 2 +- breezy/__init__.py | 2 +- doc/en/release-notes/brz-3.3.txt | 5 +++++ lib-rio/Cargo.toml | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index b37e048f76..737668a31a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "breezy" -version = "3.3.4" +version = "3.3.5" authors = [ "Martin Packman ", "Jelmer Vernooij "] edition = "2018" publish = false diff --git a/breezy/__init__.py b/breezy/__init__.py index 88fbcfecfa..e0d97267c3 100644 --- a/breezy/__init__.py +++ b/breezy/__init__.py @@ -50,7 +50,7 @@ # Python version 2.0 is (2, 0, 0, 'final', 0)." Additionally we use a # releaselevel of 'dev' for unreleased under-development code. -version_info = (3, 3, 4, 'final', 0) +version_info = (3, 3, 5, 'dev', 0) def _format_version_tuple(version_info): diff --git a/doc/en/release-notes/brz-3.3.txt b/doc/en/release-notes/brz-3.3.txt index 6c8291ad73..c45d64a634 100644 --- a/doc/en/release-notes/brz-3.3.txt +++ b/doc/en/release-notes/brz-3.3.txt @@ -5,6 +5,11 @@ Breezy Release Notes .. toctree:: :maxdepth: 1 +brz 3.3.5 +######### + +:3.3.5: UNRELEASED + brz 3.3.4 ######### diff --git a/lib-rio/Cargo.toml b/lib-rio/Cargo.toml index 6a2395c014..42285d402e 100644 --- a/lib-rio/Cargo.toml +++ b/lib-rio/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rio-py" -version = "3.3.4" +version = "3.3.5" edition = "2018" [lib] From ab823a24db6f397a99eecf7dc4f3d175345410e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Mon, 4 Sep 2023 18:06:58 +0000 Subject: [PATCH 4/6] List scripts as dynamic; fixing a setuptools warning --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 604e50c36c..eec6994717 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,7 +35,7 @@ dependencies = [ "urllib3>=1.24.1", "pyyaml", ] -dynamic = ["version"] +dynamic = ["version", "scripts"] [project.urls] Homepage = "https://www.breezy-vcs.org/" From 5dd670b07f0e472fe81f85002282bee5f969cf98 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of brz Date: Sat, 9 Sep 2023 07:44:56 +0000 Subject: [PATCH 5/6] Launchpad automatic translations update. --- po/af.po | 15549 ++++++++++++++++++++++++++++++++++++++++++++++++++ po/ar.po | 7877 +++++++++++++------------ po/ast.po | 7876 +++++++++++++------------ po/bs.po | 7877 +++++++++++++------------ po/ca.po | 7876 +++++++++++++------------ po/ckb.po | 14528 ++++++++++++++++++++++++++++++++++++++++++++++ po/cs.po | 7876 +++++++++++++------------ po/de.po | 7876 +++++++++++++------------ po/el.po | 7876 +++++++++++++------------ po/en_AU.po | 7876 +++++++++++++------------ po/en_GB.po | 8311 +++++++++++++++------------ po/es.po | 7876 +++++++++++++------------ po/fa.po | 7876 +++++++++++++------------ po/fo.po | 7876 +++++++++++++------------ po/fr.po | 7876 +++++++++++++------------ po/gl.po | 7876 +++++++++++++------------ po/he.po | 7876 +++++++++++++------------ po/id.po | 7878 +++++++++++++------------ po/it.po | 7876 +++++++++++++------------ po/ja.po | 7883 +++++++++++++------------ po/ko.po | 8128 ++++++++++++++------------ po/ku.po | 14528 ++++++++++++++++++++++++++++++++++++++++++++++ po/ms.po | 7876 +++++++++++++------------ po/my.po | 7876 +++++++++++++------------ po/nb.po | 7876 +++++++++++++------------ po/nl.po | 7876 +++++++++++++------------ po/oc.po | 7890 +++++++++++++------------ po/pl.po | 7877 +++++++++++++------------ po/pt.po | 14539 ++++++++++++++++++++++++++++++++++++++++++++++ po/pt_BR.po | 14464 +++++++++++++++++++++++++++++++--------------- po/ro.po | 7877 +++++++++++++------------ po/ru.po | 7879 +++++++++++++------------ po/sco.po | 7876 +++++++++++++------------ po/si.po | 7876 +++++++++++++------------ po/sk.po | 7876 +++++++++++++------------ po/sr.po | 7879 +++++++++++++------------ po/sv.po | 7876 +++++++++++++------------ po/tr.po | 7876 +++++++++++++------------ po/ug.po | 7876 +++++++++++++------------ po/uk.po | 7877 +++++++++++++------------ po/vi.po | 7876 +++++++++++++------------ po/zh_CN.po | 8123 ++++++++++++++------------ 42 files changed, 229177 insertions(+), 136811 deletions(-) create mode 100644 po/af.po create mode 100644 po/ckb.po create mode 100644 po/ku.po create mode 100644 po/pt.po diff --git a/po/af.po b/po/af.po new file mode 100644 index 0000000000..e99f7667bf --- /dev/null +++ b/po/af.po @@ -0,0 +1,15549 @@ +# Afrikaans translation for brz +# Copyright (c) 2023 Rosetta Contributors and Canonical Ltd 2023 +# This file is distributed under the same license as the brz package. +# FIRST AUTHOR , 2023. +# +msgid "" +msgstr "" +"Project-Id-Version: brz\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2023-05-23 19:09+0100\n" +"PO-Revision-Date: 2023-09-08 16:30+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Afrikaans \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Launchpad-Export-Date: 2023-09-09 07:34+0000\n" +"X-Generator: Launchpad (build 32eed776db4e1fe74faaa77122cde19862d565ac)\n" + +#: breezy/add.py:89 +#, python-brace-format +msgid "skipping {0} (larger than {1} of {2} bytes)" +msgstr "slaan {0} oor (groter as {1} van {2} grepe)" + +#: breezy/bisect.py:262 +msgid "Find an interesting commit using a binary search." +msgstr "Vind 'n interessante pleeg deur 'n binêre soektog te gebruik." + +#: breezy/bisect.py:264 +msgid "" +"Bisecting, in a nutshell, is a way to find the commit at which\n" +"some testable change was made, such as the introduction of a bug\n" +"or feature. By identifying a version which did not have the\n" +"interesting change and a later version which did, a developer\n" +"can test for the presence of the change at various points in\n" +"the history, eventually ending up at the precise commit when\n" +"the change was first introduced." +msgstr "" +"Bisecting, in 'n neutedop, is 'n manier om die commit te vind by watter\n" +"een of ander toetsbare verandering was aangebring, soos die bekendstelling " +"van 'n gogga\n" +"of kenmerk. Deur 'n weergawe te identifiseer dat nie het die\n" +"interessante verandering en 'n latere weergawe watter het gedoen, 'n " +"ontwikkelaar\n" +"kan toets vir die teenwoordigheid van die verandering op verskeie punte in\n" +"die geskiedenis, beland eindig by die presiese pleeg wanneer\n" +"die verandering was eerste- ingestel." + +#: breezy/bisect.py:272 +msgid "" +"This command uses subcommands to implement the search, each\n" +"of which changes the state of the bisection. The\n" +"subcommands are:" +msgstr "" +"Hierdie bevel gebruiks subbevele om te implementeer die soektog, elk\n" +"waarvan verander die staat van die bisection. Die\n" +"subbevele word:" + +#: breezy/bisect.py:276 +msgid "" +"brz bisect start\n" +" Start a bisect, possibly clearing out a previous bisect." +msgstr "" +"brz bisect begin\n" +" Begin bisect, moontlik duidelike uite 'n vorige bisect." + +#: breezy/bisect.py:279 +msgid "" +"brz bisect yes [-r rev]\n" +" The specified revision (or the current revision, if not given)\n" +" has the characteristic we're looking for," +msgstr "" +"brz bisect ja [-r rev]\n" +" Die gespesifiseerde revisie (of die huidige revisie, indien nie gegee)\n" +" het die kenmerkende ons soek vir," + +#: breezy/bisect.py:283 +msgid "" +"brz bisect no [-r rev]\n" +" The specified revision (or the current revision, if not given)\n" +" does not have the characteristic we're looking for," +msgstr "" +"brz bisect nee [-r rev]\n" +" Die gespesifiseerde revisie (of die huidige revisie, indien nie gegee)\n" +" het die kenmerkende ons soek vir," + +#: breezy/bisect.py:287 +msgid "" +"brz bisect move -r rev\n" +" Switch to a different revision manually. Use if the bisect\n" +" algorithm chooses a revision that is not suitable. Try to\n" +" move as little as possible." +msgstr "" +"brz bisect beweeg -r rev\n" +" Oorskakel om te 'n verskillende revisie handmatig. Gebruik indien die " +"bisect\n" +" algoritme kies 'n revisie dat is nie geskik. Probeer om\n" +" beweeg so min as moontlik." + +#: breezy/bisect.py:292 +msgid "" +"brz bisect reset\n" +" Clear out a bisection in progress." +msgstr "" +"brz bisect terugstel\n" +" Duidelike uite 'n bisection in vooruitgang." + +#: breezy/bisect.py:295 +msgid "" +"brz bisect log [-o file]\n" +" Output a log of the current bisection to standard output, or\n" +" to the specified file." +msgstr "" +"brz bisect log [-o file]\n" +" Uitset 'n log van die huidige bisection na standaard uitset, of\n" +" na die gespesifiseerde lêer." + +#: breezy/bisect.py:299 +msgid "" +"brz bisect replay \n" +" Replay a previously-saved bisect log, forgetting any bisection\n" +" that might be in progress." +msgstr "" +"brz bisect herspeel \n" +" Herspeel 'n voorheen-gestoor bisect log, vergeet enige bisection\n" +" dat mag wees in vooruitgang." + +#: breezy/bisect.py:303 +msgid "" +"brz bisect run