GNU bug report logs -
#58660
[PATCH 0/4] Minor tweaks of etc/teams.scm
Previous Next
Reported by: zimoun <zimon.toutoune <at> gmail.com>
Date: Thu, 20 Oct 2022 13:23:02 UTC
Severity: normal
Tags: moreinfo, patch
Done: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Bug is archived. No further changes may be made.
Full log
View this message in rfc822 format
[Message part 1 (text/plain, inline)]
Your bug report
#58660: [PATCH 0/4] Minor tweaks of etc/teams.scm
which was filed against the guix-patches package, has been closed.
The explanation is attached below, along with your original report.
If you require more details, please reply to 58660 <at> debbugs.gnu.org.
--
58660: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=58660
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems
[Message part 2 (message/rfc822, inline)]
Hi,
zimoun <zimon.toutoune <at> gmail.com> writes:
> Hi Mathieu,
>
> On Fri, 18 Nov 2022 at 18:23, Mathieu Othacehe <othacehe <at> gnu.org> wrote:
>
>
>> Why not:
>>
>> (scope (format #f "scope:~%~{+ ~s ~}~%" scope))
>
> Because this does not “itemize” correctly. For instance, it outputs:
>
> id: python
> name: Python team
> description: Python, Python packages, the "pypi" importer, and the python-build-system.
> scope:
> + "gnu/packages/django.scm" + "gnu/packages/jupyter.scm" + #<regexp 7f408800d500> + "gnu/packages/sphinx.scm" + "gnu/packages/tryton.scm" + "guix/build/pyproject-build-system.scm" + "guix/build-system/pyproject.scm" + "guix/build/python-build-system.scm" + "guix/build-system/python.scm" + "guix/import/pypi.scm" + "guix/scripts/import/pypi.scm" + "tests/pypi.scm"
> members:
> + Lars-Dominik Braun <lars <at> 6xq.net>
> + jgart <jgart <at> dismail.de>
>
>
> When what we want is:
>
> scope:
> + "gnu/packages/django.scm"
> + "gnu/packages/jupyter.scm"
> + #<regexp 7f408800d500>
> + "gnu/packages/sphinx.scm"
> + "gnu/packages/tryton.scm"
> + "guix/build/pyproject-build-system.scm"
> + "guix/build-system/pyproject.scm"
> + "guix/build/python-build-system.scm"
> + "guix/build-system/python.scm"
> + "guix/import/pypi.scm"
> + "guix/scripts/import/pypi.scm"
> + "tests/pypi.scm"
>
>
> Well, the ’~%’ is included:
>
> (scope (format #f "scope:~%~{+ ~s~% ~}~%" scope))))
>
> then there is one extra:
>
> id: python
> name: Python team
> description: Python, Python packages, the "pypi" importer, and the python-build-system.
> scope:
> + "gnu/packages/django.scm"
> + "gnu/packages/jupyter.scm"
> + #<regexp 7f40de756500>
> + "gnu/packages/sphinx.scm"
> + "gnu/packages/tryton.scm"
> + "guix/build/pyproject-build-system.scm"
> + "guix/build-system/pyproject.scm"
> + "guix/build/python-build-system.scm"
> + "guix/build-system/python.scm"
> + "guix/import/pypi.scm"
> + "guix/scripts/import/pypi.scm"
> + "tests/pypi.scm"
>
> members:
> + Lars-Dominik Braun <lars <at> 6xq.net>
> + jgart <jgart <at> dismail.de>
That's fixable with the 'escape' escape, ~^:
--8<---------------cut here---------------start------------->8---
(format #f "scope:~%~{+ ~a~^~%~}~%" scope)
--8<---------------cut here---------------end--------------->8---
I've reworked your v2, integrating the comments from Mathieu and
installed it as 4d7b25a0e2abd77625cdc888c60da8e6add02bbd.
Closing!
--
Thanks,
Maxim
[Message part 3 (message/rfc822, inline)]
Hi,
The first patch displays the regexp pattern and sort the files. Compare,
--8<---------------cut here---------------start------------->8---
$ etc/teams.scm list-teams | recsel -n 21
id: java
name: Java and Maven team
description: The JDK and JRE, the Maven build system, Java packages, the ant-build-system, and the maven-build-system.
scope: #<regexp 7f61135ef3c0> #<regexp 7f61135ef380> "guix/build/ant-build-system.scm" "guix/build/java-utils.scm" "guix/build/maven-build-system.scm" #<regexp 7f61135ef340> "guix/build-system/ant.scm" "guix/build-system/maven.scm"
members:
+ Julien Lepiller <julien <at> lepiller.eu>
+ Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
--8<---------------cut here---------------end--------------->8---
with
--8<---------------cut here---------------start------------->8---
id: java
name: Java and Maven team
description: The JDK and JRE, the Maven build system, Java packages, the ant-build-system, and the maven-build-system.
scope: "^gnu/packages/java(-.+|)\\.scm$" "^gnu/packages/maven(-.+|)\\.scm$" "^guix/build/maven/" "guix/build-system/ant.scm" "guix/build-system/maven.scm" "guix/build/ant-build-system.scm" "guix/build/java-utils.scm" "guix/build/maven-build-system.scm"
members:
+ Julien Lepiller <julien <at> lepiller.eu>
+ Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
--8<---------------cut here---------------end--------------->8---
Maybe I miss a point about regexp but I have not found a way to access the
pattern. Hence this new <regexp*> record.
The second patch sorts the members,
--8<---------------cut here---------------start------------->8---
$ etc/teams.scm list-members mentors
( <paren <at> disroot.org>
Christopher Baines <mail <at> cbaines.net>
Ludovic Courtès <ludo <at> gnu.org>
Mathieu Othacehe <othacehe <at> gnu.org>
Ricardo Wurmus <rekado <at> elephly.net>
Simon Tournier <zimon.toutoune <at> gmail.com>
jgart <jgart <at> dismail.de>
--8<---------------cut here---------------end--------------->8---
The third patch sorts the teams,
--8<---------------cut here---------------start------------->8---
$ etc/teams.scm list-teams | recsel -Cp id
id: core
id: emacs
id: embedded-bootstrap
id: games
id: go
id: haskell
id: home
id: installer
id: java
id: julia
id: kernel
id: lisp
id: mentors
id: mozilla
id: ocaml
id: python
id: r
id: racket
id: ruby
id: rust
id: science
id: translations
--8<---------------cut here---------------end--------------->8---
Note that show a team is not super handy,
--8<---------------cut here---------------start------------->8---
$ etc/teams.scm list-teams | recsel -Cp id | grep -n id
1:id: core
2:id: emacs
3:id: embedded-bootstrap
4:id: games
5:id: go
6:id: haskell
7:id: home
8:id: installer
9:id: java
10:id: julia
11:id: kernel
12:id: lisp
13:id: mentors
14:id: mozilla
15:id: ocaml
16:id: python
17:id: r
18:id: racket
19:id: ruby
20:id: rust
21:id: science
22:id: translations
$ etc/teams.scm list-teams | recsel -n 7
id: installer
name: Installer script and system installer
description: <none>
scope: "^gnu/installer(\\.scm$|/)"
members:
+ Josselin Poiret <dev <at> jpoiret.xyz>
+ Mathieu Othacehe <othacehe <at> gnu.org>
--8<---------------cut here---------------end--------------->8---
Hence the last patch, (hum, I am not convinced :-))
--8<---------------cut here---------------start------------->8---
$ etc/teams.scm list-teams | recsel -Cp id
id: (0) core
id: (1) emacs
id: (2) embedded-bootstrap
id: (3) games
id: (4) go
id: (5) haskell
id: (6) home
id: (7) installer
id: (8) java
id: (9) julia
id: (10) kernel
id: (11) lisp
id: (12) mentors
id: (13) mozilla
id: (14) ocaml
id: (15) python
id: (16) r
id: (17) racket
id: (18) ruby
id: (19) rust
id: (20) science
id: (21) translations
$ etc/teams.scm list-teams | recsel -n 15
id: (15) python
name: Python team
description: Python, Python packages, the "pypi" importer, and the python-build-system.
scope: "^gnu/packages/python(-.+|)\\.scm$" "gnu/packages/django.scm" "gnu/packages/jupyter.scm" "gnu/packages/sphinx.scm" "gnu/packages/tryton.scm" "guix/build-system/python.scm" "guix/build/python-build-system.scm" "guix/import/pypi.scm" "guix/scripts/import/pypi.scm" "tests/pypi.scm"
members:
+ Lars-Dominik Braun <lars <at> 6xq.net>
+ jgart <jgart <at> dismail.de>
--8<---------------cut here---------------end--------------->8---
Cheers,
simon
zimoun (4):
etc: teams: Improve scope display.
etc: teams: List members sorted by name.
etc: teams: List teams sorted by id.
etc: teams: Display an id number.
etc/teams.scm.in | 83 ++++++++++++++++++++++++++++++++++--------------
1 file changed, 59 insertions(+), 24 deletions(-)
base-commit: 4716cea6256523a8ecf90a426d675bfb7620f3e4
--
2.36.0
This bug report was last modified 1 year and 349 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.