From 5845c8992ca3eedc9b07b224bd83b48070e3806f Mon Sep 17 00:00:00 2001 From: Lukas Puehringer Date: Tue, 15 Feb 2022 16:57:27 +0100 Subject: [PATCH 1/2] doc: update acknowledgements and rm AUHTORS.txt Update README.md#Acknowledgements - Reword to acknowledge maintainer contributions as well - Remove names that are mentioned in maintainers document - Remove duplicate Konstantin Andrianov Santiago Torres-Arias, Sebastien Awwad, Trishank Kuppusamy, Vladimir Diaz) - Add new significant contributors (Ivana Atanasova, Kairo de Araujo, Martin Vrachev) Remove unmaintained AUTHORS.txt, which lists many individuals and organisations that are/were not affiliated with 'python-tuf', but other projects in the TUF ecosystem (Thandy, Notary, etc.) and thus is not suited for this repository. -> theupdateframework.io#38 Caveats: - Significant contributors means top ~20 committers sorted by commit count (`git shortlog -s`). - The Acknowledgements section might miss significant contributors, if they contributed by other means than git commits in this repo. Signed-off-by: Lukas Puehringer --- README.md | 18 +++++++------- docs/AUTHORS.txt | 62 ------------------------------------------------ 2 files changed, 9 insertions(+), 71 deletions(-) delete mode 100644 docs/AUTHORS.txt diff --git a/README.md b/README.md index c3b24f3c2d..17e171a205 100644 --- a/README.md +++ b/README.md @@ -120,15 +120,15 @@ Acknowledgements ---------------- This project is hosted by the Linux Foundation under the Cloud Native Computing -Foundation. TUF's early development was managed by -members of the [Secure Systems Lab](https://ssl.engineering.nyu.edu/) at [New -York University](https://engineering.nyu.edu/). We appreciate the efforts of -Konstantin Andrianov, Geremy Condra, Vladimir Diaz, Yuyu Zheng, Sebastien Awwad, -Santiago Torres-Arias, Trishank Kuppusamy, Zane Fisher, Pankhuri Goyal, Tian Tian, -Konstantin Andrianov, and Justin Samuel who are among those who helped significantly -with TUF's reference implementation. [Contributors](https://github.com/theupdateframework/python-tuf/blob/develop/docs/AUTHORS.txt) -and -[maintainers](https://github.com/theupdateframework/python-tuf/blob/develop/docs/MAINTAINERS.txt) +Foundation. TUF's early development was managed by members of the [Secure +Systems Lab](https://ssl.engineering.nyu.edu/) at [New York +University](https://engineering.nyu.edu/). We appreciate the efforts of all +[maintainers and emeritus +maintainers](https://github.com/theupdateframework/python-tuf/blob/develop/docs/MAINTAINERS.txt), +as well as the contributors Konstantin Andrianov, Kairo de Araujo, Ivana +Atanasova, Geremy Condra, Zane Fisher, Pankhuri Goyal, Justin Samuel, Tian +Tian, Martin Vrachev and Yuyu Zheng who are among those who helped +significantly with TUF's reference implementation. Maintainers and Contributors are governed by the [CNCF Community Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md). diff --git a/docs/AUTHORS.txt b/docs/AUTHORS.txt deleted file mode 100644 index 376f201ee0..0000000000 --- a/docs/AUTHORS.txt +++ /dev/null @@ -1,62 +0,0 @@ -The TUF project is managed by Justin Cappos at NYU (jcappos@nyu.edu). See GOVERNANCE.md for more information. - -Contributors: - -Organizations -------------- - -Advanced Telematic Systems -Datadog -Docker -Flynn -LEAP -OCaml -Quay by CoreOS - -Individuals ------------ - -Alan Castonguay -Andrew Meyer -Arturo Filastò -Benno Fünfstück -David Halls -David Lawrence -Diogo Monica -Eric Hartsuyker -Evan Cordell -Felix Wang -Geremy Condra -goldenMetteyya -Hannes Mehnert -Jerry Trieu -Johannes Dorfner -John Ward -Jonathan Rudenberg -Julian Hille -Justin Cappos -Justin Samuel -Konstantin Andrianov -Linda Vigdor -Lois DeLong -Lukas Puehringer -María José Barrera -Martin Peck -Max Goodman -Monzur Muhammad -Nektarios Tsoutsos -Nick Mathewson -Pankhuri Goyal -Riyaz Faizullabhoy -Roger Dingledine -Ruben Pollan -Santiago Torres -Sebastian Hahn -Sebastien Awwad -Tian Tian -Trishank Karthik Kuppusamy -Vladimir Diaz -Wilson Ding -Ying Li -Yuyu Zheng -Zane Fisher From c5e787c3289440fb1e72eebfa498634a122ba3d7 Mon Sep 17 00:00:00 2001 From: Lukas Puehringer Date: Wed, 16 Feb 2022 11:05:02 +0100 Subject: [PATCH 2/2] CI: remind to update contributor acknowledgement Add optional task to maintainer permission review reminder checklist that suggests to also update the list of significant contributors in README.md#acknowledgements. Signed-off-by: Lukas Puehringer --- .github/workflows/maintainer-permissions-reminder.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/maintainer-permissions-reminder.yml b/.github/workflows/maintainer-permissions-reminder.yml index 55e6e7918b..7e1b0e14c3 100644 --- a/.github/workflows/maintainer-permissions-reminder.yml +++ b/.github/workflows/maintainer-permissions-reminder.yml @@ -31,6 +31,7 @@ jobs: * Each additional maintainer/admin increases the risk of project compromise: for this reason permissions should be removed if they are no longer used * For services that are not frequently used, each maintainer/admin should check that they really are still able to authenticate to the service and confirm this in the comments 3. Update MAINTAINERS.txt to reflect current permissions + 4. (Bonus) Update significant contributors in README.md#acknowledgements ### Critical services