Status of python-team branch

Status of python-team branch

[Sharlatan Hellseher]

[-- Attachment #1: Type: text/plain, Size: 673 bytes --]


Hi Guix!

I'd like to check who is working on python-team branch to prepare it for
the merge? Especially I'd need to test a fresh version of python-attrs
which involves rebuild of 1000+ packages:

--8<---------------cut here---------------start------------->8---
> ./pre-inst-env guix refresh --list-dependent python-attrs
Building the following 472 packages would ensure 1111 dependent packages
are rebuilt: <...>
--8<---------------cut here---------------end--------------->8---

It's during monthly Astro packages update which requires attrs>=22.2.0 
<https://github.com/asdf-format/asdf/commit/14ea0af00693c8ac0fe29e89006674be1dd631d8.

Thanks,
Oleg

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

Re: Status of python-team branch

[Lars-Dominik Braun]

Hi,

> I'd like to check who is working on python-team branch to prepare it for
> the merge?

I don’t think anyone is actively working on it right now. #71408 is
the place where any updates should be if there were any. CC’ing a few
people who have contributed to the branch or stated they have interest,
just to be sure.

> --8<---------------cut here---------------start------------->8---
> > ./pre-inst-env guix refresh --list-dependent python-attrs
> Building the following 472 packages would ensure 1111 dependent packages
> are rebuilt: <...>
> --8<---------------cut here---------------end--------------->8---

Perhaps we can cherry-pick fabbb32638813b944b9da3749599fac6eed4221c
(and maybe more) onto a branch based on the current master and see which
packages fail with just that change?

Lars

Re: Status of python-team branch

[Ricardo Wurmus]

Lars-Dominik Braun <lars@6xq.net> writes:

> Hi,
>
>> I'd like to check who is working on python-team branch to prepare it for
>> the merge?
>
> I don’t think anyone is actively working on it right now. #71408 is
> the place where any updates should be if there were any. CC’ing a few
> people who have contributed to the branch or stated they have interest,
> just to be sure.

I'm currently on leave, but I think it would make sense to rebase
python-team on top of core-updates.

My last contributions were to core-updates, not to python-team.  Since
core-updates is next in line to be merged I think our next step should
be to rebase python-team before any more incompatible work is done on
that branch.

-- 
Ricardo

Re: Status of python-team branch

[Ricardo Wurmus]

Ricardo Wurmus <rekado@elephly.net> writes:

> Lars-Dominik Braun <lars@6xq.net> writes:
>
>> Hi,
>>
>>> I'd like to check who is working on python-team branch to prepare it for
>>> the merge?
>>
>> I don’t think anyone is actively working on it right now. #71408 is
>> the place where any updates should be if there were any. CC’ing a few
>> people who have contributed to the branch or stated they have interest,
>> just to be sure.
>
> I'm currently on leave, but I think it would make sense to rebase
> python-team on top of core-updates.
>
> My last contributions were to core-updates, not to python-team.  Since
> core-updates is next in line to be merged I think our next step should
> be to rebase python-team before any more incompatible work is done on
> that branch.

Now that core-updates has been merged, the python-team branch would be
next in line for a merge.

Is anyone interested in rebasing the branch?

-- 
Ricardo

Re: Status of python-team branch

[Sharlatan Hellseher]

[-- Attachment #1: Type: text/plain, Size: 213 bytes --]

Hi,

I may volunteer myself to that
- rebase on current master
- resolve conflicts
- apply pending patches from issues
- push for testing
- merge to master

Is anyone interested in rebasing the branch?
>

Oleg

>

[-- Attachment #2: Type: text/html, Size: 1002 bytes --]

Re: Status of python-team branch

[jgart]

> I may volunteer myself to that

Hi Oleg,

Feel free to send a request for merging.

I don't have the bandwidth at the moment to work on fixing that branch.

That said,

I'll be happy to help in approving the team branch and reviewing qa in order to facilitate you merging it.

In the future, I think we should have smaller topic branches. 

For example, we could request to update particular python packages with large rebuilds on a dedicated branch such as python-team-python-sphinx, one request at a time. I think that breaking up the team branch merge request into smaller chunks could help with focusing on getting branches merged and preventing them from growing large or becoming long lived.

If I do large python updates in the future, I will take this approach myself.

Thanks for working on it.

all the best,

jgart

https://whereis.みんな/

Re: Status of python-team branch

[Sharlatan Hellseher]

[-- Attachment #1: Type: text/plain, Size: 144 bytes --]


Hi necto,

Please take a look at current merge status of the branch, it may be
delayed.

https://issues.guix.gnu.org/71408

--
Oleg 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

Re: Status of python-team branch

[Arseniy Zaostrovnykh]

[-- Attachment #1: Type: text/plain, Size: 241 bytes --]

Thanks!

On Tue, 24 Sept 2024, 13:03 Sharlatan Hellseher, <sharlatanus@gmail.com>
wrote:

>
> Hi necto,
>
> Please take a look at current merge status of the branch, it may be
> delayed.
>
> https://issues.guix.gnu.org/71408
>
> --
> Oleg
>

[-- Attachment #2: Type: text/html, Size: 626 bytes --]

Re: Status of python-team branch

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 492 bytes --]

Sharlatan Hellseher <sharlatanus@gmail.com> writes:

> Hi,
>
> I may volunteer myself to that
> - rebase on current master
> - resolve conflicts
> - apply pending patches from issues
> - push for testing
> - merge to master
>
>  Is anyone interested in rebasing the branch?

Are you still looking at rebasing python-team?

I've looked at it myself, but I've got stuck with the big "gnu: Add
python-setuptools/python-wheel where necessary."
(Icd7699fc1dc56e974ae7568f2ae916dbf876bea5) commit.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

Re: Status of python-team branch

[Sharlatan Hellseher]

[-- Attachment #1: Type: text/plain, Size: 741 bytes --]

Hi,

Same for me, starting resolving rebase conflict.

I'm finishing go-team right now and will have some free time on Sat.

Thanks,
Oleg

On Thu, 26 Sept 2024, 16:01 Christopher Baines, <mail@cbaines.net> wrote:

> Sharlatan Hellseher <sharlatanus@gmail.com> writes:
>
> > Hi,
> >
> > I may volunteer myself to that
> > - rebase on current master
> > - resolve conflicts
> > - apply pending patches from issues
> > - push for testing
> > - merge to master
> >
> >  Is anyone interested in rebasing the branch?
>
> Are you still looking at rebasing python-team?
>
> I've looked at it myself, but I've got stuck with the big "gnu: Add
> python-setuptools/python-wheel where necessary."
> (Icd7699fc1dc56e974ae7568f2ae916dbf876bea5) commit.
>

[-- Attachment #2: Type: text/html, Size: 1393 bytes --]

Re: Status of python-team branch

[jgart]

[-- Attachment #1: Type: text/plain, Size: 515 bytes --]

> 
> Same for me, starting resolving rebase conflict.
> 
Hi Guixers,

I would recommend cherry picking logical commits into new branches that can be quickly reviewed and merged by Guix volunteers.

Steve made a list here of some logical commits that can go into new branches:

https://issues.guix.gnu.org/71408#11

Feel free to send small patch sets of those for review by Guix volunteers to look at.

I can take some time to review and apply such small patches and test them.

all the best,

jgart

[-- Attachment #2: Type: text/html, Size: 1027 bytes --]

Re: Status of python-team branch

[Steve George]

Hi,

I got 31 from the 'start' of the branch applied:

https://issues.guix.gnu.org/71408#13

There are notes on the ones I couldn't get working, and the 
python-project build system ones that Lars was going to cherry-pick 
separately.

I've rebuild about 100+ dependent packages. But some of these require 2k 
dependent packages to be rebuilt! From what I can tell these 31 don't 
make master 'worse' (insufficient sample etc).

I'll create a second branch and 'stack' it on top of this first one, and 
keep going. There are 231 commits in total, so 10% at a time!

Steve / Futurile

On 26/09/2024 18:27, jgart wrote:
> 
>     Same for me, starting resolving rebase conflict.
> 
> 
> Hi Guixers,
> 
> I would recommend cherry picking logical commits into new branches that 
> can be quickly reviewed and merged by Guix volunteers.
> 
> Steve made a list here of some logical commits that can go into new 
> branches:
> 
> https://issues.guix.gnu.org/71408#11 <https://issues.guix.gnu.org/71408#11>
> 
> Feel free to send small patch sets of those for review by Guix 
> volunteers to look at.
> 
> I can take some time to review and apply such small patches and test them.
> 
> all the best,
> 
> jgart
>