From 92530e90ddf73e9fd948dc5a068be63db53b829c Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Mon, 7 Aug 2023 16:59:29 -0700
Subject: [PATCH 1/5] maintainers: add tjni to python team

---
 maintainers/team-list.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index f541d01a684b..6e52910a97ba 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -734,6 +734,7 @@ with lib.maintainers; {
       fridh
       hexa
       jonringer
+      tjni
     ];
     scope = "Maintain the Python interpreter and related packages.";
     shortName = "Python";

From d9f5626dd706a24a6dbdd58b09e6a899aaf60231 Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Wed, 26 Jul 2023 00:53:26 -0700
Subject: [PATCH 2/5] python3.pkgs.build: add python team to maintainers

---
 pkgs/development/python-modules/build/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix
index e7c45afdd317..0eaad47c44f0 100644
--- a/pkgs/development/python-modules/build/default.nix
+++ b/pkgs/development/python-modules/build/default.nix
@@ -86,6 +86,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/pypa/build";
     changelog = "https://github.com/pypa/build/blob/${version}/CHANGELOG.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    maintainers = teams.python.members ++ [ maintainers.fab ];
   };
 }

From 9613eec9eafa68712dcb662c248b577df64e58f0 Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Wed, 26 Jul 2023 00:53:54 -0700
Subject: [PATCH 3/5] python3.pkgs.flit-core: add python team to maintainers

Also add a changelog link.
---
 pkgs/development/python-modules/flit-core/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/flit-core/default.nix b/pkgs/development/python-modules/flit-core/default.nix
index c81a8567de2f..0d0c3785f881 100644
--- a/pkgs/development/python-modules/flit-core/default.nix
+++ b/pkgs/development/python-modules/flit-core/default.nix
@@ -36,7 +36,8 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Distribution-building parts of Flit. See flit package for more information";
     homepage = "https://github.com/pypa/flit";
+    changelog = "https://github.com/pypa/flit/blob/${src.rev}/doc/history.rst";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ fridh ];
+    maintainers = teams.python.members;
   };
 }

From ad69eef941f6012653c0a3121fb970439b5f20a3 Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Wed, 26 Jul 2023 00:55:09 -0700
Subject: [PATCH 4/5] python3.pkgs.installer: add python team to maintainers

Also update the owner of the GitHub repository.
---
 pkgs/development/python-modules/installer/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/installer/default.nix b/pkgs/development/python-modules/installer/default.nix
index 9d3c8185322a..02934550273b 100644
--- a/pkgs/development/python-modules/installer/default.nix
+++ b/pkgs/development/python-modules/installer/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   format = "pyproject";
 
   src = fetchFromGitHub {
-    owner = "pradyunsg";
+    owner = "pypa";
     repo = pname;
     rev = version;
     hash = "sha256-thHghU+1Alpay5r9Dc3v7ATRFfYKV8l9qR0nbGOOX/A=";
@@ -27,10 +27,10 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
-    changelog = "https://github.com/pypa/installer/blob/${src.rev}/docs/changelog.md";
-    homepage = "https://github.com/pradyunsg/installer";
     description = "A low-level library for installing a Python package from a wheel distribution";
+    homepage = "https://github.com/pypa/installer";
+    changelog = "https://github.com/pypa/installer/blob/${src.rev}/docs/changelog.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ cpcloud fridh ];
+    maintainers = teams.python.members ++ [ maintainers.cpcloud ];
   };
 }

From 682b78c850744235a5adbd7c554062405ecabd69 Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Wed, 26 Jul 2023 00:55:49 -0700
Subject: [PATCH 5/5] python3.pkgs.pyproject-hooks: add python team to
 maintainers

---
 pkgs/development/python-modules/pyproject-hooks/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyproject-hooks/default.nix b/pkgs/development/python-modules/pyproject-hooks/default.nix
index 76bf3902c3d2..d751160b54d8 100644
--- a/pkgs/development/python-modules/pyproject-hooks/default.nix
+++ b/pkgs/development/python-modules/pyproject-hooks/default.nix
@@ -26,8 +26,7 @@ buildPythonPackage rec {
     flit-core
   ];
 
-  propagatedBuildInputs = [
-  ] ++ lib.optionals (pythonOlder "3.11") [
+  propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [
     tomli
   ];
 
@@ -52,6 +51,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/pypa/pyproject-hooks";
     changelog = "https://github.com/pypa/pyproject-hooks/blob/v${version}/docs/changelog.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ hexa ];
+    maintainers = teams.python.members;
   };
 }