[Git][reproducible-builds/reproducible-website][master] 4 commits: Move unwieldy contributors.sh shell script into a Python script.
Chris Lamb (@lamby)
gitlab at salsa.debian.org
Tue Feb 15 17:49:32 UTC 2022
Chris Lamb pushed to branch master at Reproducible Builds / reproducible-website
Commits:
71c16263 by Chris Lamb at 2022-02-15T09:49:20-08:00
Move unwieldy contributors.sh shell script into a Python script.
- - - - -
d675d776 by Chris Lamb at 2022-02-15T09:49:20-08:00
Drop trailing whitespace.
- - - - -
b5fb1448 by Chris Lamb at 2022-02-15T09:49:20-08:00
Misc /who/people/ & sponsors tidying.
- - - - -
60793bce by Chris Lamb at 2022-02-15T09:49:20-08:00
2022-02 += forwarded #1005826 <https://github.com/matplotlib/mpl-sphinx-theme/pull/25>
- - - - -
6 changed files:
- Makefile
- _includes/navbar_side.html
- _reports/2022-02.md
- + bin/contributors.py
- − bin/contributors.sh
- who_/people.md
Changes:
=====================================
Makefile
=====================================
@@ -2,7 +2,7 @@ LANGUAGES := $(shell ruby -ryaml -e "data = YAML::load(open('_config.yml')); put
all:
./bin/i18n.sh
- ./bin/contributors.sh
+ ./bin/contributors.py
jekyll build --verbose --trace
clean:
=====================================
_includes/navbar_side.html
=====================================
@@ -20,32 +20,21 @@
{% if sponsors.size != 0 %}
<div class="row sponsors d-none d-md-block">
<div class="fixed-bottom">
- <div class="row">
- <ul class="list-group pt-5">
- <li class="list-group-item rb-main-sidebar">
- Platinum & Gold sponsors:
- </li>
- </ul>
- </div>
- {% for x in sponsors %}
- <div class="col-md-2 col-sm-3 mb-2 p-2">
+ {% for x in sponsors %}
+ <div class="col-md-2 col-sm-3 mb-2 p-2">
<div class="card text-center">
<a href="{{ x.url }}" name="{{ x.name }}">
<img class="px-1 py-2" src="{{ x.logo | prepend: "/assets/images/sponsors/" | relative_url }}" alt="{{ x.name }}">
</a>
</div>
</div>
- {% endfor %}
- {% assign sponsors = site.pages | where:"url","/who/sponsors/" %}
- {% for x in sponsors %}
- <div class="row">
- <ul class="list-group pt-5">
- <li class="list-group-item rb-main-sidebar">
- <a href="{{ x.url | relative_url }}" class="sidebar__link__darkGray">All our sponsors</a>
- </li>
- </ul>
+ {% endfor %}
+
+ <div class="row">
+ <div class="col-md-2 text-center p-2">
+ <small><a href="{{ "/who/sponsors/" | relative_url }}">All sponsors</a></small>
</div>
- {% endfor %}
+ </div>
</div>
</div>
{% endif %}
=====================================
_reports/2022-02.md
=====================================
@@ -25,3 +25,5 @@ draft: true
465f9c33 pass --invariant and -i deb00001 to mkfs.msdos
65196d4d Avoid embedding timestamps into gzipped Packages and Translations files.
+
+* [forwarded #1005826](https://github.com/matplotlib/mpl-sphinx-theme/pull/25)
=====================================
bin/contributors.py
=====================================
@@ -0,0 +1,92 @@
+#!/usr/bin/env python3
+
+import subprocess
+import yaml
+
+# eg. https://salsa.debian.org/reproducible-builds/reproducible-presentations/-/blob/master/2021-08-24-where-we-come-from-and-where-we-are-going/index.html
+EXTRA = {
+ "akira",
+ "Alexander Couzens (lynxis)",
+ "Alexis Bienvenüe",
+ "Allan Gunn (gunner)",
+ "Andrew Ayer",
+ "Asheesh Laroia",
+ "Ben Hutchings",
+ "Boyuan Yang",
+ "Ceridwen",
+ "Christoph Berg",
+ "Chris West",
+ "Clint Adams",
+ "Dafydd Harries",
+ "Daniel Stender",
+ "David Suarez",
+ "Drew Fisher",
+ "Ed Maste",
+ "Elio Qoshi",
+ "Emmanuel Bourg",
+ "Esa Peuha",
+ "Fabian Keil",
+ "Fabian Wolff",
+ "Guillem Jover",
+ "Hannes Mehnert",
+ "Harlan Lieberman-Berg",
+ "Helmut Grohne",
+ "HW42",
+ "Jan Nieuwenhuizen",
+ "Jelmer Vernooij",
+ "Juan Picca",
+ "Justin Cappos",
+ "Levente Polyak",
+ "Ludovic Courtès",
+ "Marcus Hoffmann (bubu)",
+ "Maria Glukhova",
+ "Mathieu Bridon",
+ "Morten Linderud",
+ "Nicolas Boulenguez",
+ "Niels Thykier",
+ "Omar Navarro Leija",
+ "Paul Wise",
+ "Peter De Wachter",
+ "Philip Rinn",
+ "Robbie Harwood",
+ "Santiago Vila",
+ "Sascha Steinbiss",
+ "Satyam Zode",
+ "Scarlett Clark",
+ "Stefano Rivera",
+ "Stéphane Glondu",
+ "Steven Chamberlain",
+ "Tom Fitzhenry",
+ "Valentin Lorentz",
+ "Wookey",
+}
+
+NICKNAMES = {
+ ("Holger Levsen", "h01ger"),
+ ("Jeremy Bobbio", "lunar"),
+}
+
+
+def get_git_authors():
+ output = subprocess.check_output(("git", "log", "--format=%aN"))
+
+ return {x for x in output.decode("utf-8").split("\n") if x}
+
+
+def main():
+ data = set(get_git_authors())
+ data.update(EXTRA)
+
+ for x, y in NICKNAMES:
+ try:
+ data.remove(x)
+ data.add(f"{x} ({y})")
+ except KeyError:
+ pass
+
+ with open("_data/contributors.yml", "w") as f:
+ yaml.dump(sorted(list(data)), f)
+
+
+if __name__ == "__main__":
+ main()
=====================================
bin/contributors.sh deleted
=====================================
@@ -1,74 +0,0 @@
-#!/bin/sh
-#
-# list all contributors of this git repository and then add some...
-#
-
-
-(
-# first add some other contributors "from elsewhere", mostly https://salsa.debian.org/reproducible-builds/reproducible-presentations/-/blob/master/2021-08-24-where-we-come-from-and-where-we-are-going/index.html
-cat << EOF
- akira
- Alexander Couzens (lynxis)
- Alexis Bienvenüe
- Allan Gunn (gunner)
- Andrew Ayer
- Asheesh Laroia
- Ben Hutchings
- Boyuan Yang
- Ceridwen
- Christoph Berg
- Chris West
- Clint Adams
- Dafydd Harries
- Daniel Stender
- David Suarez
- Drew Fisher
- Ed Maste
- Elio Qoshi
- Emmanuel Bourg
- Esa Peuha
- Fabian Keil
- Fabian Wolff
- Guillem Jover
- Hannes Mehnert
- Harlan Lieberman-Berg
- Helmut Grohne
- HW42
- Jan Nieuwenhuizen
- Jelmer Vernooij
- Juan Picca
- Justin Cappos
- Levente Polyak
- Ludovic Courtès
- Marcus Hoffmann (bubu)
- Maria Glukhova
- Mathieu Bridon
- Morten Linderud
- Nicolas Boulenguez
- Niels Thykier
- Omar Navarro Leija
- Paul Wise
- Peter De Wachter
- Philip Rinn
- Robbie Harwood
- Santiago Vila
- Sascha Steinbiss
- Satyam Zode
- Scarlett Clark
- Stefano Rivera
- Stéphane Glondu
- Steven Chamberlain
- Tom Fitzhenry
- Valentin Lorentz
- Wookey
-EOF
-# then, modify some git authors (below, but for syntax reasons, the comment is here)
-git log --format=%aN
-) | sort | uniq | \
-sed \
--e 's#Bobbio#Bobbio (lunar)#' \
--e 's#Levsen#Levsen (h01ger)#' \
-| while read X
-do
- printf -- "- %s\n" "${X}"
-done > _data/contributors.yml
=====================================
who_/people.md
=====================================
@@ -16,15 +16,10 @@ Various people in many projects are or have been working together on providing r
{% if site.data.contributors %}
## Contributors
-These are some of these lovely people.
+> {% for x in site.data.contributors %}{{ x }}{% unless forloop.last %}, {% endunless %}{% endfor %}.
-*Some*, because currently we mostly list people here who contributed to the git
-repository of this website, which covers many, but also misses many, so we've
-manually added some. If you know someone who should be listed here, but is missing, please email
-[`contact at reproducible-builds.org`](mailto:contact at reproducible-builds.org) and
-we will improve the data gathering.
-
-{% for x in site.data.contributors %}{{ x }}{% unless forloop.last %}, {% endunless %}{% endfor %}.
+If you know someone who should be listed here, please email
+[`contact at reproducible-builds.org`](mailto:contact at reproducible-builds.org).
{% endif %}
View it on GitLab: https://salsa.debian.org/reproducible-builds/reproducible-website/-/compare/6b52468d4b66c48dbc4117ab6f1015d93c4d1bea...60793bcefb40afd40e44525c82bf7e14773af83b
--
View it on GitLab: https://salsa.debian.org/reproducible-builds/reproducible-website/-/compare/6b52468d4b66c48dbc4117ab6f1015d93c4d1bea...60793bcefb40afd40e44525c82bf7e14773af83b
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20220215/998d24c8/attachment.htm>
More information about the rb-commits
mailing list