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 --]

Status of python-team branch

[Sharlatan Hellseher]

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


Hi python-team@guix!

I finally found some time to complete rebasing process of python-team on
master, few commits were not required.

New rebased python-team branch is pushed for CI to pick it up.
Older branch is renamed to python-team-old for future reference before
merging python-team to master.

As far as I could noticed during rebase task the main changes is
refreshed pyproject-build-system and Python packages migration to it.

There are a few branches in a queue to be merged, let's see how many
adjustments python-team needs to be applied before placing it on the
queue.

Rebased on d95588242c605fbb72e25fe36a0903a1538e9018 from master.

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

[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
> 

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

[Sharlatan Hellseher]

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


Hi,

CC python-team

Let's prepare the branch to be merged?

I took a flag to fix build issues on python-team after introducing
adjustment to pyproject-build-system requiring python-setuptools and
python-wheel somtimes to be availalbe in inputs.

I try to minimise the amount of changes and just add missing inputs or
update the packages if it helps to fix the build.

** TODO 20241104203753-python-team
- [X] 1306855-4351017 python-mrkd-0.2.0
  - https://ci.guix.gnu.org/build/4351017/details
  - error: Test failed: <unittest.runner.TextTestResult run=1 errors=1 failures=0>
  - [X] fix chain [1/1]
    - [X] remove python-mrkd

- [X] 1306855-4350959 python-m2r-0.3.1
  - https://ci.guix.gnu.org/build/4350959/details
  - AttributeError: module 'mistune' has no attribute 'BlockGrammar'
  - [X] fix chain [3/3]
    - [X] python-altair
      - [X] remove python-m2r
    - [X] python-automat
      - [X] update 20.10.0->22.10.0
      - [X] remove python-m2r
      - [X] add python-setuptools and python-wheel
      - [X] swap to pyproejct-build-system
    - [X] remove python-m2r

- [X] 1306855-4350978 python-mistune-next-2.0.4
  - https://ci.guix.gnu.org/build/4350978/details
  - ModuleNotFoundError: No module named 'setuptools'
  - [X] fix chain [16/16]
    - [X] python-kiwisolver
      - [X] update to 1.4.6
      - [X] add python-setuptools and python-wheel
    - [X] python-array-api-compat
      - [X] update 1.6->1.9.1
      - [X] add python-setuptools and python-wheel
    - [X] python-assay
      - [X] add python-setuptools and python-wheel
    - [X] python-botocore
      - [X] update 1.24.35->1.35.54
      - [X] add python-setuptools, python-wheel, python-jsonschema and python-pytest,
        python-pytest-xdist
      - [X] enable tests
    - [X] python-boto3
      - [X] update 1.21.35->1.35.54
      - [X] add python-setuptools, python-wheel, python-pytest-xdist
      - [X] enable tests
      - [X] swap to pyproejct-build-system
    - [X] python-s3transfer
      - [X] update 0.5.0->0.10.3
      - [X] add python-setuptools, python-wheel, python-pytest-xdist
    - [X] awscli@1
      - [X] update 1.22.90->1.35.20
      - [X] add python-setuptools, python-wheel, python-pytest-xdist
    - [X] python-daft
      - [X] add python-setuptools and python-wheel
    - [X] python-django
      - [X] add python-setuptools and python-wheel
    - [X] python-immutables
      - [X] update 0.18->0.21
    - [X] python-jplephem
      - [X] add python-setuptools and python-wheel
    - [X] python-jsonpickle
      - [X] add python-wheel
    - [X] python-lazy-loader
      - [X] add python-setuptools and python-wheel
    - [X] python-lightning-utilities
      - [X] add python-setuptools and python-wheel
    - [X] python-optree
      - [X] add python-setuptools and python-wheel
    - [X] python-parameterized-next
      - [X] add python-setuptools and python-wheel

I've stoped on python-pillow-simd which failes on master.

More hands required =) 

--
Oleg

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

Re: Status of python-team branch

[Tanguy LE CARROUR]

Hi Oleg, hi Python team,


Quoting Sharlatan Hellseher (2024-11-05 14:47:56)
> CC python-team
> 
> Let's prepare the branch to be merged?

Thanks for working on this.

I do realize that, since I added myself to the team, I haven’t been
really helpful. Sorry for that! 😞
I’ve been spending most of my Guix-time on Guix@Paris and, more recently,
on Guix Foundation.
Hope I can find time to work on more technical aspects in a near future! 🤞
I still have Python 3.12 pending (https://issues.guix.gnu.org/60240)
and I have to work on 3.13 and 3.14! 🐍

Thanks again for your time and effort!

-- 
Tanguy