GNU logs - #71408, boring messages

Message sent to guix-patches@HIDDEN:

Subject: [bug#71408] Request for merging "python-team" branch
Resent-From: Christopher Baines <mail@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Fri, 07 Jun 2024 08:56:02 +0000
Resent-Message-ID: <handler.71408.B.171775055028886 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 71408 <at> debbugs.gnu.org
From: Christopher Baines <mail@HIDDEN>
User-Agent: mu4e 1.12.4; emacs 29.3
Date: Fri, 07 Jun 2024 09:24:51 +0100
Message-ID: <8734pp2m98.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
 micalg=pgp-sha512; protocol="application/pgp-signature"
Received-SPF: pass client-ip=2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27;
 envelope-from=mail@HIDDEN; helo=mira.cbaines.net
X-Spam_score_int: -18
X-Spam_score: -1.9
X-Spam_bar: -
X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001,
 SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.4 (-)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.4 (--)

--=-=-=
Content-Type: text/plain

I haven't been involved in this branch, but I'm opening the request for
merge issue just to keep track of things.

--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmZiw9RfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9XcIshAAim5e+epdlXWL1jNQSYVcarPA5E6RUehw
Ap2TQKHFzChXMlBibike/5OOCfiQkZzWMxheqP1HGrMmbyaQPDdJorA3qTuh8EhK
QIDL6Ycu0mdFambgl4bAfwQ4vEpqC8qiYUhRO+iRUi7KDiayX7uFghmPYZigKtco
kLmI6FzyMLGpk8dvz5CzJTpX+4zhYdMhzswfpNF+I40Yq0rfYMUGsGUaDdfJZIRb
ismw7xgql5I0FveL1H8iMcth5+MAT3AIE6Pd4Zyor3ezs8JmB9WLTs+GH5IWnbBd
V4RuCmin6NrWH/IEaNBi9sbjTMwb3g/q7jhtJMqgNEz2850KOHl7KbQhU9555aEd
N3FJp72EUV+EF1yywRdFBIr9gt7fS7PjWrAoXGPp+wqLFSAI9YCzK12kE5CtrHFI
4V5cAqoJMLSZLGsIrL2bpDj8DUGoaYmZOaLUFiyHF6CrvH02p7va8vQeGkzL1ygg
tlA6Vwu9V0Mwn/tjMrrIxwyrL7XKCIitVNZHWTAwU1/hWoSx4VYkq0JfDR9g9lCC
ddJeXPuU0aRRfRMrxeJqTImF88y+3ZY01/XinabYwlmywsNJlzYsHmnFJI4yHtgv
e9EarK36aCtCaCHZtdAluMPuhvmOWcyCzs2g5o4xGQQ3f7ad29CEsdPklIgC7OuI
NQgO7mtWSjo=
=L9mn
-----END PGP SIGNATURE-----
--=-=-=--

Message sent:

Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
Content-Type: text/plain; charset=utf-8
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: Christopher Baines <mail@HIDDEN>
Subject: bug#71408: Acknowledgement (Request for merging "python-team" branch)
Message-ID: <handler.71408.B.171775055028886.ack <at> debbugs.gnu.org>
References: <8734pp2m98.fsf@HIDDEN>
X-Gnu-PR-Message: ack 71408
X-Gnu-PR-Package: guix-patches
Reply-To: 71408 <at> debbugs.gnu.org
Date: Fri, 07 Jun 2024 08:56:02 +0000

Thank you for filing a new bug report with debbugs.gnu.org.

This is an automatically generated reply to let you know your message
has been received.

Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.

Your message has been sent to the package maintainer(s):
 guix-patches@HIDDEN

If you wish to submit further information on this problem, please
send it to 71408 <at> debbugs.gnu.org.

Please do not send mail to help-debbugs@HIDDEN unless you wish
to report a problem with the Bug-tracking system.

--=20
71408: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D71408
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems

Message sent to guix-patches@HIDDEN:

Subject: [bug#71408] Request for merging "python-team" branch
Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sat, 08 Jun 2024 14:29:02 +0000
Resent-Message-ID: <handler.71408.B71408.171785689629083 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: Christopher Baines <mail@HIDDEN>
Cc: Sharlatan Hellseher <sharlatanus@HIDDEN>, Munyoki Kilyungi <me@HIDDEN>, 71408 <at> debbugs.gnu.org, Lars-Dominik Braun <lars@HIDDEN>, jgart <jgart@HIDDEN>, Marius Bakke <marius@HIDDEN>, Tanguy Le Carrour <tanguy@HIDDEN>
From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
In-Reply-To: <8734pp2m98.fsf@HIDDEN> (Christopher Baines's message of
 "Fri, 07 Jun 2024 09:24:51 +0100")
References: <8734pp2m98.fsf@HIDDEN>
Date: Sat, 08 Jun 2024 16:27:45 +0200
Message-ID: <871q57fr1a.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

Hello,

(Cc=E2=80=99ing the Python team.)

Christopher Baines <mail@HIDDEN> skribis:

> I haven't been involved in this branch, but I'm opening the request for
> merge issue just to keep track of things.

I haven=E2=80=99t been involved either.  My understanding is that the main
blocker before merging is assessing the amount of breakage introduced in
this branch=C2=B9.

Right now it=E2=80=99s built at 89% on x86_64-linux only, which is a bit le=
ss
than on =E2=80=98master=E2=80=99 but there are still pending builds.  Inter=
ested readers
can browse failed builds at:

  https://ci.guix.gnu.org/eval/latest/dashboard?spec=3Dpython-team

(If you find builds that failed due to transient errors like the
infamous =E2=80=9Cmissing derivation=E2=80=9D, you can click on =E2=80=9CAc=
tion -> Restart=E2=80=9D=E2=80=94this
is now available in most cases without privileges.)

An important issue seems to be test failures of =E2=80=98python-responses=
=E2=80=99:

  https://ci.guix.gnu.org/build/4738398/details

Excerpt:

--8<---------------cut here---------------start------------->8---
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D short test summary info =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
FAILED responses/tests/test_responses.py::test_auto_calculate_content_lengt=
h_doesnt_override_existing_value
FAILED responses/tests/test_responses.py::TestMaxRetry::test_max_retries - =
Ty...
FAILED responses/tests/test_responses.py::TestMaxRetry::test_max_retries_ex=
ceed[True]
FAILED responses/tests/test_responses.py::TestMaxRetry::test_max_retries_ex=
ceed[False]
FAILED responses/tests/test_responses.py::TestMaxRetry::test_max_retries_ex=
ceed_msg
FAILED responses/tests/test_responses.py::TestMaxRetry::test_adapter_retry_=
untouched
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 6 failed, 187 passed, 2 skipped, 20 wa=
rnings in 21.86s =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--8<---------------cut here---------------end--------------->8---

Ideas, Pythonistas?  :-)

Ludo=E2=80=99.

=C2=B9 https://lists.gnu.org/archive/html/guix-devel/2024-05/msg00227.html

Message sent to guix-patches@HIDDEN:

Subject: [bug#71408] Request for merging "python-team" branch
Resent-From: Sharlatan Hellseher <sharlatanus@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sat, 08 Jun 2024 21:56:02 +0000
Resent-Message-ID: <handler.71408.B71408.171788372416190 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Cc: Tanguy Le Carrour <tanguy@HIDDEN>, Munyoki Kilyungi <me@HIDDEN>, Christopher Baines <mail@HIDDEN>, Lars-Dominik Braun <lars@HIDDEN>, 71408 <at> debbugs.gnu.org, jgart <jgart@HIDDEN>, Marius Bakke <marius@HIDDEN>
MIME-Version: 1.0
References: <8734pp2m98.fsf@HIDDEN> <871q57fr1a.fsf@HIDDEN>
In-Reply-To: <871q57fr1a.fsf@HIDDEN>
From: Sharlatan Hellseher <sharlatanus@HIDDEN>
Date: Sat, 8 Jun 2024 22:04:10 +0100
Message-ID: <CAO+9K5pP6Hd=Y4S=t4QfkZHBKd2rdNv9au86oD2hY0X+oxmrxg@HIDDEN>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

Hi,

All failed tests have the same reason:

--8<---------------cut here---------------start------------->8---
        adapter =3D requests.adapters.HTTPAdapter(
>           max_retries=3DRetry(
                total=3Dtotal,
                backoff_factor=3D0.1,
                status_forcelist=3D[500],
                method_whitelist=3D["GET", "POST", "PATCH"],
                raise_on_status=3Draise_on_status,
            )
        )
E       TypeError: Retry.__init__() got an unexpected keyword argument
'method_whitelist'
--8<---------------cut here---------------end--------------->8---

It looks like the bump to the latest version would resolve it 0.22.0 -> 0.2=
5.2

--8<---------------cut here---------------start------------->8---
guix refresh --list-dependent python-responses
Building the following 198 packages would ensure 456 dependent
packages are rebuilt: <...>
--8<---------------cut here---------------end--------------->8---

There are some mentioned in GitHub issues with the same simptoms:
https://github.com/GeneralMills/pytrends/issues/591
https://github.com/jamalex/notion-py/issues/386

On Sat, 8 Jun 2024 at 15:27, Ludovic Court=C3=A8s <ludo@HIDDEN> wrote:
>
> Hello,
>
> (Cc=E2=80=99ing the Python team.)
>
> Christopher Baines <mail@HIDDEN> skribis:
>
> > I haven't been involved in this branch, but I'm opening the request for
> > merge issue just to keep track of things.
>
> I haven=E2=80=99t been involved either.  My understanding is that the mai=
n
> blocker before merging is assessing the amount of breakage introduced in
> this branch=C2=B9.
>
> Right now it=E2=80=99s built at 89% on x86_64-linux only, which is a bit =
less
> than on =E2=80=98master=E2=80=99 but there are still pending builds.  Int=
erested readers
> can browse failed builds at:
>
>   https://ci.guix.gnu.org/eval/latest/dashboard?spec=3Dpython-team
>
> (If you find builds that failed due to transient errors like the
> infamous =E2=80=9Cmissing derivation=E2=80=9D, you can click on =E2=80=9C=
Action -> Restart=E2=80=9D=E2=80=94this
> is now available in most cases without privileges.)
>
> An important issue seems to be test failures of =E2=80=98python-responses=
=E2=80=99:
>
>   https://ci.guix.gnu.org/build/4738398/details
>
> Excerpt:
>
> --8<---------------cut here---------------start------------->8---
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D short test summary info =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> FAILED responses/tests/test_responses.py::test_auto_calculate_content_len=
gth_doesnt_override_existing_value
> FAILED responses/tests/test_responses.py::TestMaxRetry::test_max_retries =
- Ty...
> FAILED responses/tests/test_responses.py::TestMaxRetry::test_max_retries_=
exceed[True]
> FAILED responses/tests/test_responses.py::TestMaxRetry::test_max_retries_=
exceed[False]
> FAILED responses/tests/test_responses.py::TestMaxRetry::test_max_retries_=
exceed_msg
> FAILED responses/tests/test_responses.py::TestMaxRetry::test_adapter_retr=
y_untouched
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 6 failed, 187 passed, 2 skipped, 20 =
warnings in 21.86s =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --8<---------------cut here---------------end--------------->8---
>
> Ideas, Pythonistas?  :-)
>
> Ludo=E2=80=99.
>
> =C2=B9 https://lists.gnu.org/archive/html/guix-devel/2024-05/msg00227.htm=
l



--=20
VCS: https://github.incerto.xyz/; https://git.sr.ht/~hellseher/
GPG: 9847 81DE 689C 21C2 6418 0867 76D7 27BF F62C D2B5

=E2=80=A6 =D0=BD=D0=B0=D1=88 =D1=80=D0=B0=D0=B7=D1=83=D0=BC - =D0=BF=D1=80=
=D0=B5=D0=B2=D0=BE=D1=81=D1=85=D0=BE=D0=B4=D0=BD=D0=B0=D1=8F =D0=BE=D0=B1=
=D1=8A=D1=8F=D1=81=D0=BD=D0=B8=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D0=B0=D1=8F =
=D0=BC=D0=B0=D1=88=D0=B8=D0=BD=D0=B0 =D0=BA=D0=BE=D1=82=D0=BE=D1=80=D0=B0=
=D1=8F =D1=81=D0=BF=D0=BE=D1=81=D0=BE=D0=B1=D0=BD=D0=B0
=D0=BD=D0=B0=D0=B9=D1=82=D0=B8 =D1=81=D0=BC=D1=8B=D1=81=D0=BB =D0=BF=D0=BE=
=D1=87=D1=82=D0=B8 =D0=B2 =D1=87=D0=B5=D0=BC =D1=83=D0=B3=D0=BE=D0=B4=D0=BD=
=D0=BE, =D0=B8=D1=81=D1=82=D0=BE=D0=BB=D0=BA=D0=BE=D0=B2=D0=B0=D1=82=D1=8C =
=D0=BB=D1=8E=D0=B1=D0=BE=D0=B9 =D1=84=D0=B5=D0=BD=D0=BE=D0=BC=D0=B5=D0=BD, =
=D0=BD=D0=BE
=D1=81=D0=BE=D0=B2=D0=B5=D1=80=D1=88=D0=B5=D0=BD=D0=BD=D0=BE =D0=BD=D0=B5 =
=D0=B2 =D1=81=D0=BE=D1=81=D1=82=D0=BE=D1=8F=D0=BD=D0=B8=D0=B8 =D0=BF=D1=80=
=D0=B8=D0=BD=D1=8F=D1=82=D1=8C =D0=BC=D1=8B=D1=81=D0=BB=D1=8C =D0=BE =D0=BD=
=D0=B5=D0=BF=D1=80=D0=B5=D0=B4=D1=81=D0=BA=D0=B0=D0=B7=D1=83=D0=B5=D0=BC=D0=
=BE=D1=81=D1=82=D0=B8.

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#71408] Request for merging "python-team" branch
References: <8734pp2m98.fsf@HIDDEN>
In-Reply-To: <8734pp2m98.fsf@HIDDEN>
Resent-From: "jgart" <jgart@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Tue, 18 Jun 2024 20:48:01 +0000
Resent-Message-ID: <handler.71408.B71408.17187436221561 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 71408
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: 
To: 71408 <at> debbugs.gnu.org
Cc: tanguy@HIDDEN, Sharlatan Hellseher <sharlatanus@HIDDEN>, rprior@HIDDEN, me@HIDDEN, Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Christopher Baines <mail@HIDDEN>, lars@HIDDEN, marius@HIDDEN, Nicolas Graves <ngraves@HIDDEN>
Received: via spool by 71408-submit <at> debbugs.gnu.org id=B71408.17187436221561
          (code B ref 71408); Tue, 18 Jun 2024 20:48:01 +0000
Received: (at 71408) by debbugs.gnu.org; 18 Jun 2024 20:47:02 +0000
Received: from localhost ([127.0.0.1]:51651 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sJfjJ-0000P6-Sg
	for submit <at> debbugs.gnu.org; Tue, 18 Jun 2024 16:47:02 -0400
Received: from mx1.dismail.de ([78.46.223.134]:26892)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <jgart@HIDDEN>) id 1sJfjH-0000OY-V8
 for 71408 <at> debbugs.gnu.org; Tue, 18 Jun 2024 16:47:01 -0400
Received: from mx1.dismail.de (localhost [127.0.0.1])
 by mx1.dismail.de (OpenSMTPD) with ESMTP id 3636148e;
 Tue, 18 Jun 2024 22:46:49 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=dismail.de; h=
 mime-version:date:content-type:content-transfer-encoding:from
 :message-id:subject:to:cc; s=20190914; bh=0spGNO/IW8/KzbHjIKmyQa
 O11vWsN92vFow6FW+o4Fg=; b=tyJ/RsDpIPZfn3Czxa2tWTwkbys1K8o6gIO+t0
 D89fMKPuOUCTw2fqJxOYTOojFbL8XiX5bexwFW3pxJv/vW0H7q27l6xEd4fY7rw3
 hQD8BqJuAg/NFuc3lXmmYCp5aJYTm+yaawHvTh1cL26hTaWkyBsWtKetSjRcY5UG
 tjkHgx0puj4NvPEU7vmnyF1NC2N1VgQDz6W8aNX3kKg2CbHMxGJk08HahxEUe4L7
 rTvUAXSCde7ThJcysre41WkbgIFYBmRJWvw6YtQZFDDFKFqgk0/1PDOrYIEdULAQ
 UDljcATPvo2gqAP7RDVhaeb44I/En7Lfg5NnvvlJt/UWwm8g==
Received: from smtp1.dismail.de (<unknown> [10.240.26.11])
 by mx1.dismail.de (OpenSMTPD) with ESMTP id dfa98c46;
 Tue, 18 Jun 2024 22:46:48 +0200 (CEST)
Received: from smtp1.dismail.de (localhost [127.0.0.1])
 by smtp1.dismail.de (OpenSMTPD) with ESMTP id d6d9ed26;
 Tue, 18 Jun 2024 22:46:48 +0200 (CEST)
Received: by dismail.de (OpenSMTPD) with ESMTPSA id 9bb2c522
 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); 
 Tue, 18 Jun 2024 22:46:48 +0200 (CEST)
MIME-Version: 1.0
Date: Tue, 18 Jun 2024 20:46:47 +0000
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
From: "jgart" <jgart@HIDDEN>
Message-ID: <330818cb39329dd4ded9d263f69d26e306b25f31@HIDDEN>
TLS-Required: No
X-Spam-Score: -0.7 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

Hi Python Team, Guix Team at large, and Parenphilic Pythonistas,

This long lived python-team branch as of today has a lot of git conflicts=
 if you try to rebase and/or merge it on to master.

What do you think if we discuss an alternative team branch policy for the=
 future for feature branches that target master?

Here's a tentative proposal, with an example:=20

Instead=20of having a single python-team branch, with a wide variety of n=
ew Python features, what if we had, a python-team feature branch that we =
work on relatively quickly?

In other words, we avoid long lived branches but try to merge for example=
, a new python-team-sphinx branch as soon as the "Sphinx feature" is read=
y. This python-team-sphinx branch will only contain the work required to =
bump sphinx to the latest version that we'd like to support. The reason I=
 use python-sphinx as an example is because the python-sphinx package req=
uires a lot of rebuilds across many language ecosystems that use Sphinx f=
or documentation purposes.=20

I=20think that keeping the team branches focused on a particular team sub=
-feature within that team's scope and not using long-lived and largely sc=
oped branches will avoid a ton of frustration trying to fix merge conflic=
ts when/before we announce a request to merge.

We can then focus our focused efforts on iterating over preparing major P=
ython features and packages that require large amounts rebuilds.

WDYT?

jgart

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#71408] Request for merging "python-team" branch
Resent-From: Tanguy LE CARROUR <tanguy@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Wed, 19 Jun 2024 07:30:02 +0000
Resent-Message-ID: <handler.71408.B71408.171878214812102 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 71408
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: 
To: 71408 <at> debbugs.gnu.org, jgart <jgart@HIDDEN>
Cc: rprior@HIDDEN, Sharlatan Hellseher <sharlatanus@HIDDEN>, me@HIDDEN, Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Christopher Baines <mail@HIDDEN>, lars@HIDDEN, marius@HIDDEN, Nicolas Graves <ngraves@HIDDEN>
Received: via spool by 71408-submit <at> debbugs.gnu.org id=B71408.171878214812102
          (code B ref 71408); Wed, 19 Jun 2024 07:30:02 +0000
Received: (at 71408) by debbugs.gnu.org; 19 Jun 2024 07:29:08 +0000
Received: from localhost ([127.0.0.1]:35650 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sJpki-000398-8o
	for submit <at> debbugs.gnu.org; Wed, 19 Jun 2024 03:29:08 -0400
Received: from smtp-bc0e.mail.infomaniak.ch ([45.157.188.14]:53321)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <tanguy@HIDDEN>) id 1sJpkg-00038a-CX
 for 71408 <at> debbugs.gnu.org; Wed, 19 Jun 2024 03:29:07 -0400
Received: from smtp-4-0001.mail.infomaniak.ch (smtp-4-0001.mail.infomaniak.ch
 [10.7.10.108])
 by smtp-3-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4W3wG332mTzP48;
 Wed, 19 Jun 2024 09:28:27 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bioneland.org;
 s=20230804; t=1718782107;
 bh=TU89J4Zn6vd7tudu9cVmLOaegOVS/JsAfnrpyRak0No=;
 h=References:Subject:From:Cc:To:In-Reply-To:Date:From;
 b=WYTUMuRoPG4v0Yt34m9AV/2WHwGWzRY/DvhaaiflUUkzTb6SGqNIQ7765uekWtrRm
 5MSWWwu6DDWifm3RZehjLkj2n6rNdbCxfBduQn9Fgwk5xPvB/8ZUVpP64ymaO3s4Dm
 DqySDiyFtT4lU+GcTo+b6KS8gTq2oQbeGUdNwQH7Jcd3eYg9FZr5cQlTA8zYnj1Tyy
 0aVkyEUhDocTma3mY90oIAwUmCaZRo5b7AA/FUP453yaVxrWpMBT0sapqO11NzdHMf
 cUgrknLtchAib+S5/DyQZT9c8hE4A13v4tG49dUKyUiFsLgPhpZ/59vaPG7VsFhtiA
 ybVxV7kp8Oocw==
Received: from unknown by smtp-4-0001.mail.infomaniak.ch (Postfix) with ESMTPA
 id 4W3wG2458Nzlh6; Wed, 19 Jun 2024 09:28:26 +0200 (CEST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
References: <330818cb39329dd4ded9d263f69d26e306b25f31@HIDDEN>
From: Tanguy LE CARROUR <tanguy@HIDDEN>
In-Reply-To: <330818cb39329dd4ded9d263f69d26e306b25f31@HIDDEN>
Date: Wed, 19 Jun 2024 09:28:26 +0200
Message-ID: <171878210601.5719.1846691700938340254@HIDDEN>
User-Agent: alot/0.10
X-Infomaniak-Routing: alpha
X-Spam-Score: -0.7 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

Hi jgart,

Quoting jgart (2024-06-18 22:46:47)
> This long lived python-team branch as of today has a lot of git conflicts=
 if
> you try to rebase and/or merge it on to master.
> [=E2=80=A6]
> Here's a tentative proposal, with an example:=20
> [=E2=80=A6]
> I think that keeping the team branches focused on a particular team
> sub-feature within that team's scope and not using long-lived and largely
> scoped branches will avoid a ton of frustration trying to fix merge confl=
icts
> when/before we announce a request to merge.
>=20
> We can then focus our focused efforts on iterating over preparing major P=
ython
> features and packages that require large amounts rebuilds.

IM(V)HO=E2=80=A6 the smaller and the more-frequently-rebased the branches, =
the better!
I still haven=E2=80=99t wrapped my head around the consequences for the CI =
of rebasing
often =E2=80=94can a simple rebase trigger a world rebuild?=E2=80=94, but t=
his is definitively
something that I do =E2=80=94quite successfully!=E2=80=94 on a daily basis =
in my professional life.

I guess it=E2=80=99s just a matter of giving it a try and see? It=E2=80=99s=
 always possible to
go back to the one-branch-to-rule-them-all `python-team` branch if managing
multiple branches ends up being a pain, right?

I also have no clue how the other teams are managing their branch and their
rebase/merge policy?

--=20
Tanguy

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#71408] Request for merging "python-team" branch
Resent-From: Christopher Baines <mail@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Wed, 19 Jun 2024 13:47:02 +0000
Resent-Message-ID: <handler.71408.B71408.17188047623182 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 71408
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: 
To: "jgart" <jgart@HIDDEN>
Cc: tanguy@HIDDEN, Sharlatan Hellseher <sharlatanus@HIDDEN>, rprior@HIDDEN, me@HIDDEN, Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, 71408 <at> debbugs.gnu.org, lars@HIDDEN, marius@HIDDEN, Nicolas Graves <ngraves@HIDDEN>
Received: via spool by 71408-submit <at> debbugs.gnu.org id=B71408.17188047623182
          (code B ref 71408); Wed, 19 Jun 2024 13:47:02 +0000
Received: (at 71408) by debbugs.gnu.org; 19 Jun 2024 13:46:02 +0000
Received: from localhost ([127.0.0.1]:44274 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sJvdS-0000pD-3u
	for submit <at> debbugs.gnu.org; Wed, 19 Jun 2024 09:46:02 -0400
Received: from mira.cbaines.net ([212.71.252.8]:43860)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <mail@HIDDEN>) id 1sJvdP-0000om-2D
 for 71408 <at> debbugs.gnu.org; Wed, 19 Jun 2024 09:45:59 -0400
Received: from localhost (unknown [212.132.255.81])
 by mira.cbaines.net (Postfix) with ESMTPSA id 9C17327BBE2;
 Wed, 19 Jun 2024 14:45:24 +0100 (BST)
Received: from felis (localhost [127.0.0.1])
 by localhost (OpenSMTPD) with ESMTP id 57f7c7c9;
 Wed, 19 Jun 2024 13:45:24 +0000 (UTC)
From: Christopher Baines <mail@HIDDEN>
In-Reply-To: <330818cb39329dd4ded9d263f69d26e306b25f31@HIDDEN>
 (jgart@HIDDEN's message of "Tue, 18 Jun 2024 20:46:47 +0000")
References: <330818cb39329dd4ded9d263f69d26e306b25f31@HIDDEN>
User-Agent: mu4e 1.12.4; emacs 29.3
Date: Wed, 19 Jun 2024 14:45:22 +0100
Message-ID: <87tthp3v2l.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
 micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

"jgart" <jgart@HIDDEN> writes:

> Hi Python Team, Guix Team at large, and Parenphilic Pythonistas,
>
> This long lived python-team branch as of today has a lot of git
> conflicts if you try to rebase and/or merge it on to master.
>
> What do you think if we discuss an alternative team branch policy for
> the future for feature branches that target master?
>
> Here's a tentative proposal, with an example:=20
>
> Instead of having a single python-team branch, with a wide variety of
> new Python features, what if we had, a python-team feature branch that
> we work on relatively quickly?
>
> In other words, we avoid long lived branches but try to merge for
> example, a new python-team-sphinx branch as soon as the "Sphinx
> feature" is ready. This python-team-sphinx branch will only contain
> the work required to bump sphinx to the latest version that we'd like
> to support. The reason I use python-sphinx as an example is because
> the python-sphinx package requires a lot of rebuilds across many
> language ecosystems that use Sphinx for documentation purposes.
>
> I think that keeping the team branches focused on a particular team
> sub-feature within that team's scope and not using long-lived and
> largely scoped branches will avoid a ton of frustration trying to fix
> merge conflicts when/before we announce a request to merge.

This aligns with the current (and previous) guidance on managing
branches [1]. Providing there's a consistent topic for the branch, any
name is fine (e.g. python-team-sphinx is fine).

1: https://guix.gnu.org/manual/devel/en/html_node/Managing-Patches-and-Bran=
ches.html

I'm also hoping the requirement to create a guix-patches issue
requesting to merge the branch when it's created will help avoid the
long lived branches that we've had over the last year.

--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmZy4PJfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9XfhIA/9HdUfBn4QFicBFDWT3iL1cMSZTpqMbwX/
iKX+rir4/nYWCKNZgzfb3T+hYLN/VpyKqxj7jBOAvPVmZrt0ur/UQ34BnpTMnAH3
j4aOQ/tUAYkrR9FE9kymPXl9FIP6gFODo16fH7rI5O15zdxOqIilmHZw5P+48+vu
gTOjXfGRJfI1lBiZMcdqompe2T9Hz47Y188ddxFzvgQpYh79V7LSRKrb1OKMjbF+
j3yIV/H/9tQRzswqp0J1fx+dlXhZAdfqvh7QQ3bLLKA5hC3BYRLiBMMLM16STBj0
uNM0zDvwVuCnYsz8N0ck0B5tOga2aOOQUhuiUlSzVzXLCiDD/p3rivQNtQ71v7Zt
c81HLhnNz4KoEyA8hYefeDi09Z0+gjxMlDdCJdIZl6vdq25BJgLlEl7bmRnjuuhn
c4zDf5ZN5nnOK+QzCmstS4dkbkiYjSEqaYhkBXKub9cWLweCigIXgP2bAgIi6Hg7
dhVuAXyl8PD///0cmEhxWttiHoFWTgvz6k5LNBx90krIZO120pVVNy2o2ptBaAl4
ke/zaQPHgYuEiLG53cZOmG+cfxAFLpGxRu9hYuS/0KRrccknZfNc1pNenmKXlvDj
GiAEiQAvoLHAQcgt2E0nHGEj8NwxvoNrzpJ0ZoMEkxeXhalbw2KcGjRXti/KAoFR
vcm7yIMPrTE=
=P69h
-----END PGP SIGNATURE-----
--=-=-=--

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#71408] Request for merging "python-team" branch
Resent-From: "jgart" <jgart@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Tue, 25 Jun 2024 17:05:02 +0000
Resent-Message-ID: <handler.71408.B71408.17193350884460 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 71408
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: 
To: "Christopher Baines" <mail@HIDDEN>
Cc: tanguy@HIDDEN, Sharlatan Hellseher <sharlatanus@HIDDEN>, me@HIDDEN, Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, 71408 <at> debbugs.gnu.org, lars@HIDDEN, marius@HIDDEN, Nicolas  Graves <ngraves@HIDDEN>
Received: via spool by 71408-submit <at> debbugs.gnu.org id=B71408.17193350884460
          (code B ref 71408); Tue, 25 Jun 2024 17:05:02 +0000
Received: (at 71408) by debbugs.gnu.org; 25 Jun 2024 17:04:48 +0000
Received: from localhost ([127.0.0.1]:37627 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sM9az-00019h-7X
	for submit <at> debbugs.gnu.org; Tue, 25 Jun 2024 13:04:48 -0400
Received: from mx2.dismail.de ([159.69.191.136]:26471)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <jgart@HIDDEN>) id 1sM9ai-00018z-Da
 for 71408 <at> debbugs.gnu.org; Tue, 25 Jun 2024 13:04:39 -0400
Received: from mx2.dismail.de (localhost [127.0.0.1])
 by mx2.dismail.de (OpenSMTPD) with ESMTP id 1e22d514;
 Tue, 25 Jun 2024 19:04:04 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=dismail.de; h=
 mime-version:date:content-type:content-transfer-encoding:from
 :message-id:subject:to:cc:in-reply-to:references; s=20190914;
 bh=FTolSH6OxFHbIiTcgF72LTTBFgVhUxJMSXCtf9gsCFg=; b=ORzSDOWdhjwX
 FkngA4L5BiWZKWpEjAv+xltz4lIwK8fW6eXmIRzztLXc84J16CNknfYZFQmohr8p
 IiAMRFVFeWTnZaNO3LKFuycbs7JHV8ehSJr3GI/EZA7nkTuVml1susn8pBv3ClBM
 QCjxHqlmRBEwbmB/xOJchy5eWd7gQqYmoCevyDoKHzTah/BtUZ576Z8rxum3XjZM
 BSt5YJJ7TBhVaE+wzwKNZxNAIjQLjcM7+/foXB7mYn6Qup1m3mS2A9wtuVg90HPl
 RfHYBnFKRlBPfqGOb7Ur/ybSPC7nzqmY8eGEpRy3rm6TM8qpjM26k4/nu+Iw9GqQ
 IBW/NeKj3Q==
Received: from smtp2.dismail.de (<unknown> [10.240.26.12])
 by mx2.dismail.de (OpenSMTPD) with ESMTP id fcc0b4ef;
 Tue, 25 Jun 2024 19:04:04 +0200 (CEST)
Received: from smtp2.dismail.de (localhost [127.0.0.1])
 by smtp2.dismail.de (OpenSMTPD) with ESMTP id b0ee007b;
 Tue, 25 Jun 2024 19:04:04 +0200 (CEST)
Received: by dismail.de (OpenSMTPD) with ESMTPSA id 990c9640
 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); 
 Tue, 25 Jun 2024 19:04:03 +0200 (CEST)
MIME-Version: 1.0
Date: Tue, 25 Jun 2024 17:04:03 +0000
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
From: "jgart" <jgart@HIDDEN>
Message-ID: <e2bd1188f999d3de54ce25ba6e389eaeb1273f4f@HIDDEN>
TLS-Required: No
In-Reply-To: <87tthp3v2l.fsf@HIDDEN>
References: <330818cb39329dd4ded9d263f69d26e306b25f31@HIDDEN>
 <87tthp3v2l.fsf@HIDDEN>
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

> This aligns with the current (and previous) guidance on managing
>=20
>=20branches [1]. Providing there's a consistent topic for the branch, an=
y
>=20
>=20name is fine (e.g. python-team-sphinx is fine).

Hi Christopher,=20

That's=20great that my proposal already aligns with the current guidance.

I am going to try to start cherry picking uncontroversial and non failing=
 patches on the python-team branch on to master and removing them from th=
e python-team branch in order to reduce the size of the branch. I can the=
n remove those commits from the python-team branch and force push to upda=
te it. What do you think of this approach before I attempt it? I'll wait =
on your guidance before doing this.

Another approach I can take is to break the branch apart into 2 or 3 smal=
ler topic branches and make requests for those branches to merge one at a=
 time.

Note that I have an underpowered old Thinkpad X230 laptop and will only b=
e able to test branches that are not too large. I tried using QA/CI but i=
t seemed to be in an unknown state the last time that I tried. Any sugges=
tions here for how to more effectively use that QA/CI infrastructure woul=
d be much appreciated.

I tried spending a bit of time on trying to resolve the merge conflicts b=
ut it quickly lead down a long rabbit hole and I only have a limited time=
 to fix so many merge conflicts. The process is also currently very tedio=
us to do with high amounts of accuracy due to their being

1. Lots of commits that I am not familiar
2. Lots of commits
3. The branch has diverged alot since latest master so things don't clean=
ly apply anymore

What do you think of this current approach of cherry picking good commits=
 off of the python-team branch in order to reduce the size?

Another issue that I ran into on the branch is that there are commits tha=
t are failing. For example, at commit fdef5662cce6a57aa6bfa682c7260b65ce3=
669b8 (the borgmatic changes), borgmatic fails. Should I remove this comm=
it since it is broken?

all the best,

jgart

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#71408] Request for merging "python-team" branch
Resent-From: Sharlatan Hellseher <sharlatanus@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Tue, 25 Jun 2024 18:17:02 +0000
Resent-Message-ID: <handler.71408.B71408.171933937710777 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 71408
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: 
To: jgart <jgart@HIDDEN>
Cc: Nicolas Graves <ngraves@HIDDEN>, me@HIDDEN, Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Christopher Baines <mail@HIDDEN>, lars@HIDDEN, 71408 <at> debbugs.gnu.org, marius@HIDDEN, tanguy@HIDDEN
Received: via spool by 71408-submit <at> debbugs.gnu.org id=B71408.171933937710777
          (code B ref 71408); Tue, 25 Jun 2024 18:17:02 +0000
Received: (at 71408) by debbugs.gnu.org; 25 Jun 2024 18:16:17 +0000
Received: from localhost ([127.0.0.1]:37651 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sMAiA-0002ne-8p
	for submit <at> debbugs.gnu.org; Tue, 25 Jun 2024 14:16:17 -0400
Received: from mail-ed1-f54.google.com ([209.85.208.54]:54669)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <sharlatanus@HIDDEN>) id 1sMAhk-0002mg-Me
 for 71408 <at> debbugs.gnu.org; Tue, 25 Jun 2024 14:16:08 -0400
Received: by mail-ed1-f54.google.com with SMTP id
 4fb4d7f45d1cf-57d280e2d5dso6040883a12.1
 for <71408 <at> debbugs.gnu.org>; Tue, 25 Jun 2024 11:15:40 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1719339267; x=1719944067; darn=debbugs.gnu.org;
 h=content-transfer-encoding:cc:to:subject:message-id:date:from
 :in-reply-to:references:mime-version:from:to:cc:subject:date
 :message-id:reply-to;
 bh=rtzxKQyAlu7iLiLazxCrJ/Izu1Jk9XaMpTBuTwTyWlI=;
 b=NQoqJ6RyRo8e5yQNo4ZcTEQhK6485TTrCLNiG4FKYQsn1fHJ2aTfcfxBQ3sRWPEWNs
 ftJVDyMw7jW8mzSvRWkOTeUfjZQDsZcIDCS42aJG6BWWHci3ifNQAZDjuDGgx83kjj+7
 o0AHRBsDwnyg0wP0KY38mCsbDd8+82oZoJx/wcpO1PtOERXYu3qiRy+h1aCK49MzOMBF
 w1F+dP4VJ2YVGU7MFmjPYYb/DNBh87ojDW8tIy41tvhucO9BGUCWxFDe2lyDsHShupnb
 2QO51KXhhggJXohetBcM3uGs8oAra13/4epN1pqfIF9UQQVXwe+jkIx6Bx5NbV2lYFfY
 cEMA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1719339267; x=1719944067;
 h=content-transfer-encoding:cc:to:subject:message-id:date:from
 :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc
 :subject:date:message-id:reply-to;
 bh=rtzxKQyAlu7iLiLazxCrJ/Izu1Jk9XaMpTBuTwTyWlI=;
 b=mhe+G5HPehDLc4AtsU42rOY+baQBsDJyU90/ouYGwQjDgzj60Z2GFi3TfzYmKnM7n1
 C49pmNDSAu9apLsupIqQ5Eo3bFFJayrXadde+eoRlD1kVSMslLt5y65wwwdWUDMynKOd
 /TH1OMIfEEAPjHSl2kyOW+RWZX3GxuXDLhjIxqX/R8NGpqX6JhUeX68bZUD8fC0wK6eG
 vMAQ1SxU6JxakWShinfNH4zetP61b942NGSfZ/7yoVPUW1e3Yyfo125slmarPBLN/XZ0
 h94+e23HGorYZ5KrdQ4aMoVIp95J6LTDH1kIn1stKnYJR8NE5T7BrXG7ujAm40W/zwcA
 U6wg==
X-Forwarded-Encrypted: i=1;
 AJvYcCWuKktARaKIw+XK5L7HJk2bpbEVUb7hxzuJRuVb7mbURCOJGiM2OmPQnzBzKv9l193kfk0hUytij1DzjrYyl9g3OWJohQc=
X-Gm-Message-State: AOJu0YzdRwnlRZV1gZ8iRFGsF+lPKZ5r79l0HOzxWRYQDl0tdXPNObAT
 iHaVoSFjiV37m578ZAy5lf0EPhuwVjCiexAxFZZ2bq3qySofijyMdqUhX8K/i4/Cfd/iA2dsGaD
 zVBiNN4EpN3iD4uMyb771T+xba8fFRbe7Fv0=
X-Google-Smtp-Source: AGHT+IHfCvYMioQCiZLHeR+t2diuZJv8Tql3luwwAvkTR8PlgAIvpCYIlEMDkL3efkLXBjoWxICylZ1nIyj8LWcoHCc=
X-Received: by 2002:ac2:5f4e:0:b0:52c:e030:144e with SMTP id
 2adb3069b0e04-52ce185ecd4mr4721583e87.47.1719338774374; Tue, 25 Jun 2024
 11:06:14 -0700 (PDT)
MIME-Version: 1.0
References: <330818cb39329dd4ded9d263f69d26e306b25f31@HIDDEN>
 <87tthp3v2l.fsf@HIDDEN>
 <e2bd1188f999d3de54ce25ba6e389eaeb1273f4f@HIDDEN>
In-Reply-To: <e2bd1188f999d3de54ce25ba6e389eaeb1273f4f@HIDDEN>
From: Sharlatan Hellseher <sharlatanus@HIDDEN>
Date: Tue, 25 Jun 2024 19:06:02 +0100
Message-ID: <CAO+9K5r66s=ui1cKqVOUecqjsCbmUZ92zgQS9B2tjZZQ4HTZqg@HIDDEN>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hi,

@jgart Please let me know if you need a quick test of changes, I've got som=
e
computer recourses at home.

Thanks
Oleg

On Tue, 25 Jun 2024 at 18:04, jgart <jgart@HIDDEN> wrote:
>
> > This aligns with the current (and previous) guidance on managing
> >
> > branches [1]. Providing there's a consistent topic for the branch, any
> >
> > name is fine (e.g. python-team-sphinx is fine).
>
> Hi Christopher,
>
> That's great that my proposal already aligns with the current guidance.
>
> I am going to try to start cherry picking uncontroversial and non failing=
 patches on the python-team branch on to master and removing them from the =
python-team branch in order to reduce the size of the branch. I can then re=
move those commits from the python-team branch and force push to update it.=
 What do you think of this approach before I attempt it? I'll wait on your =
guidance before doing this.
>
> Another approach I can take is to break the branch apart into 2 or 3 smal=
ler topic branches and make requests for those branches to merge one at a t=
ime.
>
> Note that I have an underpowered old Thinkpad X230 laptop and will only b=
e able to test branches that are not too large. I tried using QA/CI but it =
seemed to be in an unknown state the last time that I tried. Any suggestion=
s here for how to more effectively use that QA/CI infrastructure would be m=
uch appreciated.
>
> I tried spending a bit of time on trying to resolve the merge conflicts b=
ut it quickly lead down a long rabbit hole and I only have a limited time t=
o fix so many merge conflicts. The process is also currently very tedious t=
o do with high amounts of accuracy due to their being
>
> 1. Lots of commits that I am not familiar
> 2. Lots of commits
> 3. The branch has diverged alot since latest master so things don't clean=
ly apply anymore
>
> What do you think of this current approach of cherry picking good commits=
 off of the python-team branch in order to reduce the size?
>
> Another issue that I ran into on the branch is that there are commits tha=
t are failing. For example, at commit fdef5662cce6a57aa6bfa682c7260b65ce366=
9b8 (the borgmatic changes), borgmatic fails. Should I remove this commit s=
ince it is broken?
>
> all the best,
>
> jgart



--=20
VCS: https://github.incerto.xyz/; https://git.sr.ht/~hellseher/
GPG: 9847 81DE 689C 21C2 6418 0867 76D7 27BF F62C D2B5

=E2=80=A6 =D0=BD=D0=B0=D1=88 =D1=80=D0=B0=D0=B7=D1=83=D0=BC - =D0=BF=D1=80=
=D0=B5=D0=B2=D0=BE=D1=81=D1=85=D0=BE=D0=B4=D0=BD=D0=B0=D1=8F =D0=BE=D0=B1=
=D1=8A=D1=8F=D1=81=D0=BD=D0=B8=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D0=B0=D1=8F =
=D0=BC=D0=B0=D1=88=D0=B8=D0=BD=D0=B0 =D0=BA=D0=BE=D1=82=D0=BE=D1=80=D0=B0=
=D1=8F =D1=81=D0=BF=D0=BE=D1=81=D0=BE=D0=B1=D0=BD=D0=B0
=D0=BD=D0=B0=D0=B9=D1=82=D0=B8 =D1=81=D0=BC=D1=8B=D1=81=D0=BB =D0=BF=D0=BE=
=D1=87=D1=82=D0=B8 =D0=B2 =D1=87=D0=B5=D0=BC =D1=83=D0=B3=D0=BE=D0=B4=D0=BD=
=D0=BE, =D0=B8=D1=81=D1=82=D0=BE=D0=BB=D0=BA=D0=BE=D0=B2=D0=B0=D1=82=D1=8C =
=D0=BB=D1=8E=D0=B1=D0=BE=D0=B9 =D1=84=D0=B5=D0=BD=D0=BE=D0=BC=D0=B5=D0=BD, =
=D0=BD=D0=BE
=D1=81=D0=BE=D0=B2=D0=B5=D1=80=D1=88=D0=B5=D0=BD=D0=BD=D0=BE =D0=BD=D0=B5 =
=D0=B2 =D1=81=D0=BE=D1=81=D1=82=D0=BE=D1=8F=D0=BD=D0=B8=D0=B8 =D0=BF=D1=80=
=D0=B8=D0=BD=D1=8F=D1=82=D1=8C =D0=BC=D1=8B=D1=81=D0=BB=D1=8C =D0=BE =D0=BD=
=D0=B5=D0=BF=D1=80=D0=B5=D0=B4=D1=81=D0=BA=D0=B0=D0=B7=D1=83=D0=B5=D0=BC=D0=
=BE=D1=81=D1=82=D0=B8.

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#71408] Request for merging "python-team" branch
Resent-From: Lars-Dominik Braun <lars@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sun, 30 Jun 2024 07:32:02 +0000
Resent-Message-ID: <handler.71408.B71408.171973271129368 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 71408
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: 
To: jgart <jgart@HIDDEN>
Cc: Sharlatan Hellseher <sharlatanus@HIDDEN>, me@HIDDEN, Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Christopher Baines <mail@HIDDEN>, marius@HIDDEN, 71408 <at> debbugs.gnu.org, tanguy@HIDDEN, Nicolas Graves <ngraves@HIDDEN>
Received: via spool by 71408-submit <at> debbugs.gnu.org id=B71408.171973271129368
          (code B ref 71408); Sun, 30 Jun 2024 07:32:02 +0000
Received: (at 71408) by debbugs.gnu.org; 30 Jun 2024 07:31:51 +0000
Received: from localhost ([127.0.0.1]:54826 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sNp2M-0007dc-UH
	for submit <at> debbugs.gnu.org; Sun, 30 Jun 2024 03:31:51 -0400
Received: from mout-p-201.mailbox.org ([80.241.56.171]:37368)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <lars@HIDDEN>) id 1sNp2J-0007dK-UT
 for 71408 <at> debbugs.gnu.org; Sun, 30 Jun 2024 03:31:48 -0400
Received: from smtp202.mailbox.org (smtp202.mailbox.org
 [IPv6:2001:67c:2050:b231:465::202])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
 (No client certificate requested)
 by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4WBgpg3rjrz9sSm;
 Sun, 30 Jun 2024 09:31:39 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001;
 t=1719732699;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=9ZQFn4B5QG52mOfVRwMklQSNLQzS4a/bVfqFh04bWMM=;
 b=XvcFI78vvzDSCmaOQXe8rDYc+QY/IrTsRY7qZ/OgZcNPM3AgTZozm25A3P6vuCULWcoAi/
 hgdErIZt1pTcCsuxeyRFrxjk2KtFI2PxJkhz1wSUCuPe4aXBBgUDRUEeegpCtsT1fRE4Xp
 tQFNl24QoTNDaTOfiehxKpDii7Iw73eG3Dri9pOzHZE6ict3D3VvEbD3UOvxd3B9sfz0nT
 EBAueeh598JIZkzqywZpMV04u0eObrS6/ftc4cCOPPCoWbBUvvCSXgmRtqD8BKe9nDPFWt
 yqQEhsND2N/pa1dtKTcxMO2rD7raHalHRbhz0r77hWUGdubqztsOSMi0oIigUg==
Date: Sun, 30 Jun 2024 09:31:36 +0200
From: Lars-Dominik Braun <lars@HIDDEN>
Message-ID: <ZoEJ2Fhf-XLeGSsu@HIDDEN>
References: <330818cb39329dd4ded9d263f69d26e306b25f31@HIDDEN>
 <87tthp3v2l.fsf@HIDDEN>
 <e2bd1188f999d3de54ce25ba6e389eaeb1273f4f@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <e2bd1188f999d3de54ce25ba6e389eaeb1273f4f@HIDDEN>
X-Rspamd-Queue-Id: 4WBgpg3rjrz9sSm
X-Spam-Score: -0.7 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

Hi,

> I am going to try to start cherry picking uncontroversial and non failing patches on the python-team branch on to master and removing them from the python-team branch in order to reduce the size of the branch. I can then remove those commits from the python-team branch and force push to update it. What do you think of this approach before I attempt it? I'll wait on your guidance before doing this.

please go ahead. Divide and conquer is imo a good approach to get this branch merged. 

> Another approach I can take is to break the branch apart into 2 or 3 smaller topic branches and make requests for those branches to merge one at a time.

I’m splitting of the build-system-related changes into the
pyproject-build-system branch (again), because these are relatively
self-contained and thus easy to merge into master.

Lars

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#71408] Request for merging "python-team" branch
Resent-From: Christopher Baines <mail@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sun, 30 Jun 2024 09:54:02 +0000
Resent-Message-ID: <handler.71408.B71408.171974122223070 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 71408
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: 
To: "jgart" <jgart@HIDDEN>
Cc: 71408 <at> debbugs.gnu.org
Received: via spool by 71408-submit <at> debbugs.gnu.org id=B71408.171974122223070
          (code B ref 71408); Sun, 30 Jun 2024 09:54:02 +0000
Received: (at 71408) by debbugs.gnu.org; 30 Jun 2024 09:53:42 +0000
Received: from localhost ([127.0.0.1]:55155 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sNrFd-000601-Qw
	for submit <at> debbugs.gnu.org; Sun, 30 Jun 2024 05:53:42 -0400
Received: from mira.cbaines.net ([212.71.252.8]:43896)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <mail@HIDDEN>) id 1sNrFb-0005zs-SR
 for 71408 <at> debbugs.gnu.org; Sun, 30 Jun 2024 05:53:40 -0400
Received: from localhost (unknown [185.201.63.252])
 by mira.cbaines.net (Postfix) with ESMTPSA id D37A327BBE2;
 Sun, 30 Jun 2024 10:50:43 +0100 (BST)
Received: from felis (localhost [127.0.0.1])
 by localhost (OpenSMTPD) with ESMTP id b6379ce4;
 Sun, 30 Jun 2024 09:42:37 +0000 (UTC)
From: Christopher Baines <mail@HIDDEN>
In-Reply-To: <e2bd1188f999d3de54ce25ba6e389eaeb1273f4f@HIDDEN>
 (jgart@HIDDEN's message of "Tue, 25 Jun 2024 17:04:03 +0000")
References: <330818cb39329dd4ded9d263f69d26e306b25f31@HIDDEN>
 <87tthp3v2l.fsf@HIDDEN>
 <e2bd1188f999d3de54ce25ba6e389eaeb1273f4f@HIDDEN>
User-Agent: mu4e 1.12.4; emacs 29.3
Date: Sun, 30 Jun 2024 10:42:33 +0100
Message-ID: <877ce63gxi.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
 micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

--=-=-=
Content-Type: text/plain

"jgart" <jgart@HIDDEN> writes:

>> This aligns with the current (and previous) guidance on managing
>> branches [1]. Providing there's a consistent topic for the branch, any
>> name is fine (e.g. python-team-sphinx is fine).
>
> That's great that my proposal already aligns with the current guidance.
>
> I am going to try to start cherry picking uncontroversial and non
> failing patches on the python-team branch on to master and removing
> them from the python-team branch in order to reduce the size of the
> branch. I can then remove those commits from the python-team branch
> and force push to update it. What do you think of this approach before
> I attempt it? I'll wait on your guidance before doing this.
>
> Another approach I can take is to break the branch apart into 2 or 3
> smaller topic branches and make requests for those branches to merge
> one at a time.

If there are commits on the branch that have been submitted as patches,
you might just be able to look at pushing them to master. If there are
commits that haven't been submitted as patches yet, but could be pushed
to master, it would be good to send them as patches so that QA can take
a look.

And splitting off some commits in to a more specific branch is fine as
well.

> Note that I have an underpowered old Thinkpad X230 laptop and will
> only be able to test branches that are not too large. I tried using
> QA/CI but it seemed to be in an unknown state the last time that I
> tried. Any suggestions here for how to more effectively use that QA/CI
> infrastructure would be much appreciated.

QA has been performing recently as it's taking too long to process
revisions. Let me know if things aren't working or if you have questions
though and I can try and help.

> I tried spending a bit of time on trying to resolve the merge
> conflicts but it quickly lead down a long rabbit hole and I only have
> a limited time to fix so many merge conflicts. The process is also
> currently very tedious to do with high amounts of accuracy due to
> their being
>
> 1. Lots of commits that I am not familiar
> 2. Lots of commits
> 3. The branch has diverged alot since latest master so things don't cleanly apply anymore
>
> What do you think of this current approach of cherry picking good
> commits off of the python-team branch in order to reduce the size?

I think making sure commits that can go to master, do go to master, is
really helpful to avoid merge conflicts. It's so much more likely to
have conflicts if there are changes that can be made on master, but are
made on a branch, or changes that should be made on a branch but are
pushed to master.

> Another issue that I ran into on the branch is that there are commits
> that are failing. For example, at commit
> fdef5662cce6a57aa6bfa682c7260b65ce3669b8 (the borgmatic changes),
> borgmatic fails. Should I remove this commit since it is broken?

While ideally we'd care about the state at each commit, this doesn't
really happen so it's up to you what you do there.

--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmaBKIlfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9XdLXA/8DGE+vIx2DyAATEljF+IIn8cxhrFmwz2z
70CPTgoS+sOWf5ulSlZWqFTj4y8Cy6pv6b3Fw2IPSkW8iuVIjCT3Z0XNUx4tqTW1
Iv/eP3+qRPW6D11dDTBz8Qzd9XX3FuIia0DEmKjk+Yt140jvhZJMQRzYQQMs0/Jp
srHKusCa9/NZOjzOErmGPJSnbPbekUS9mR/zMS27OyC+uEnZNgL1Jp/pW7SPyZXN
aJLeraKhQN7NPchx9zUbeZUpl+tgJIjHcpf4neqedyYwxLEjn2iOYcapZ0z4uvC/
LJEtlxNFDZjG6y3pmbFoBHHQoVmtRJ2+qcQshzyscKqzmcZfvFSZ8AQ804FuIjEq
q/7lQZuJFAXEd4941E/ukdVoyAnuvd54YpECIs7OENuZ1BmCSHtOvJYkD/DKnp7q
bQb1hPz3pzumCs5WnROsA6JKEj8je3KLq5/uymP2OtwAco5NLB2K7kM0hY/Zl9my
8AQXyYXXh4HRqkvBTr6UmN5CLBGM7p6+wMo83/vXDiM7kV8stsnARVEr45DBMWix
v7ikVKoNbeY1Besvr5BZld0vgNa9UNVwLIU8X9nfsvgOn23sdcaYB0v1/bl1QumT
UM//or6diwyMFG2zz6zSWF2oqid0C7AmhdmHikVZr37t3Ou4zGB7UoaK88vnlhrf
6eXNQfeJhmw=
=GDnz
-----END PGP SIGNATURE-----
--=-=-=--

Last modified: Sun, 30 Jun 2024 10:00:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.