github-org-manager 0.7.12__tar.gz → 0.7.14__tar.gz

{github_org_manager-0.7.12 → github_org_manager-0.7.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: github-org-manager
-Version: 0.7.12
+Version: 0.7.14
 Summary: Manage a GitHub Organization, its teams, repository permissions, and more
 Keywords: github,github-management,permissions,access-control
 Author: Max Mehl
@@ -26,7 +26,7 @@ Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: pygithub>=2.8.1,<3
 Requires-Dist: pyyaml>=6.0.3,<7
 Requires-Dist: requests>=2.32.5,<3
-Requires-Dist: python-slugify>=8.0.4,<9
+Requires-Dist: python-slugify>=9,<10
 Requires-Dist: jsonschema>=4.25.1,<5
 Requires-Python: >=3.10, <4
 Project-URL: Repository, https://github.com/OpenRailAssociation/github-org-manager

{github_org_manager-0.7.12 → github_org_manager-0.7.14}/gh_org_mgr/_gh_org.py

@@ -128,7 +128,7 @@ class GHorg:
     def _resolve_gh_username(self, username: str, teamname: str) -> NamedUser | None:
         """Turn a username into a proper GitHub user object."""
         try:
-            gh_user: NamedUser = self.gh.get_user(username)  # type: ignore[assignment]  # ty:ignore[invalid-assignment]
+            gh_user: NamedUser = self.gh.get_user(username)
         except UnknownObjectException:
             logging.exception(
                 "The user '%s' configured as member of team '%s' does not "
@@ -304,7 +304,7 @@ class GHorg:
 
         # First, check whether all configured parent teams exist or will be created
         for team, attributes in self.configured_teams.items():
-            if parent := attributes.get("parent"):  # type: ignore[union-attr]  # ty:ignore[unresolved-attribute]
+            if parent := attributes.get("parent"):  # ty:ignore[unresolved-attribute]
                 if parent not in self.configured_teams:
                     if parent not in self.current_teams_str:
                         logging.critical(
@@ -338,7 +338,7 @@ class GHorg:
                 if team in ordered_teams:
                     continue
                 # Team has parent, but parent not ordered yet
-                if (parent := attributes.get("parent")) and parent not in ordered_teams:  # type: ignore[union-attr]  # ty:ignore[unresolved-attribute]
+                if (parent := attributes.get("parent")) and parent not in ordered_teams:  # ty:ignore[unresolved-attribute]
                     continue
                 # Team has no parent, or parent already ordered
                 ordered_teams[team] = attributes
@@ -350,7 +350,7 @@ class GHorg:
         for team, attributes in self.configured_teams.items():
             if team not in self.current_teams_str:
                 # If a parent team is configured, try to get its ID
-                if parent := attributes.get("parent"):  # type: ignore[union-attr]  # ty:ignore[unresolved-attribute]
+                if parent := attributes.get("parent"):  # ty:ignore[unresolved-attribute]
                     try:
                         parent_id = self.org.get_team_by_slug(sluggify_teamname(parent)).id
                     except UnknownObjectException:
@@ -436,13 +436,13 @@ class GHorg:
             # Use dictionary comprehensions to build the dictionaries with the
             # relevant team settings for comparison
             configured_team_configs = {
-                key: self.configured_teams[team.name].get(key)  # type: ignore[union-attr]  # ty:ignore[unresolved-attribute]
+                key: self.configured_teams[team.name].get(key)  # ty:ignore[unresolved-attribute]
                 for key in self.TEAM_CONFIG_FIELDS
                 # Only add keys that are actually in the configuration. Deals
                 # with settings that should be changed, as they are neither
                 # defined in the default or team config, and marked as
                 # <keep-current>
-                if key in self.configured_teams[team.name]  # type: ignore[operator]  # ty:ignore[unsupported-operator]
+                if key in self.configured_teams[team.name]  # ty:ignore[unsupported-operator]
             }
             current_team_configs = {
                 key: getattr(team, key)
@@ -450,7 +450,7 @@ class GHorg:
                 # Only compare current team settings with keys that are defined
                 # as the configured team settings. Taking out settings that
                 # shall not be changed
-                if key in self.configured_teams[team.name]  # type: ignore[operator]  # ty:ignore[unsupported-operator]
+                if key in self.configured_teams[team.name]  # ty:ignore[unsupported-operator]
             }
 
             # Resolve parent team id from parent Team object or team string, and sort
@@ -480,7 +480,7 @@ class GHorg:
                 # Execute team setting changes
                 if not dry:
                     try:
-                        team.edit(name=team.name, **configured_team_configs)  # type: ignore[arg-type]  # ty:ignore[invalid-argument-type]
+                        team.edit(name=team.name, **configured_team_configs)  # ty:ignore[invalid-argument-type]
                     except GithubException as exc:
                         logging.critical(
                             "Team '%s' settings could not be edited. Error: \n%s",
@@ -512,14 +512,22 @@ class GHorg:
         return []
 
     def _get_current_team_members(self, team: Team) -> dict[NamedUser, str]:
-        """Return dict of current users with their respective roles. Also
-        contains members of child teams.
+        """Return dict of current users with their respective roles. Only
+        contains direct members of the team, not members of child teams.
         """
         current_users: dict[NamedUser, str] = {}
         for role in ("member", "maintainer"):
-            # Make a two-step check whether person is actually in team, as
-            # get_members() also return child-team members
+            # Check whether person is actually direct member of team, as
+            # get_members() also returns child-team members, marked via the
+            # "inherited" flag in the API response
             for user in list(team.get_members(role=role)):
+                if user._rawData.get("inherited"):  # noqa: SLF001
+                    logging.debug(
+                        "User '%s' is only member of a child team of '%s', ignoring",
+                        user.login,
+                        team.name,
+                    )
+                    continue
                 current_users.update({user: role})
 
         return current_users
@@ -819,7 +827,7 @@ class GHorg:
         """Create a record of all members of a team and their permissions on a
         repo due to being member of an unconfigured team.
         """
-        users_of_unconfigured_team: dict[NamedUser, str] = self.current_teams[team].get("members")  # type: ignore[assignment]  # ty:ignore[invalid-assignment]
+        users_of_unconfigured_team: dict[NamedUser, str] = self.current_teams[team].get("members")  # ty:ignore[invalid-assignment]
         # Initiate this repo in the dict as dict if not present
         if repo_name not in self.unconfigured_team_repo_permissions:
             self.unconfigured_team_repo_permissions[repo_name] = {}
@@ -893,7 +901,7 @@ class GHorg:
                 if self.configured_teams[team.name] is None:
                     remove = True
                 # Handle: Team is configured, contains config
-                elif repos := self.configured_teams[team.name].get("repos", []):  # type: ignore[union-attr]  # ty:ignore[unresolved-attribute]
+                elif repos := self.configured_teams[team.name].get("repos", []):  # ty:ignore[unresolved-attribute]
                     # If this repo has not been found in the configured repos
                     # for the team, remove all permissions
                     if repo.name not in repos:
@@ -1243,6 +1251,13 @@ class GHorg:
             if repo.name in self.graphql_repos_collaborators:
                 # Extract each collaborator from the GraphQL response for this repo
                 for collaborator in self.graphql_repos_collaborators[repo.name]:
+                    if collaborator is None or collaborator.get("node") is None:
+                        logging.debug(
+                            "Skipping collaborator entry with missing data in repo %s: %s",
+                            repo.name,
+                            collaborator,
+                        )
+                        continue
                     login: str = collaborator["node"]["login"]
                     # Skip entry if collaborator is org owner, which is "admin" anyway
                     if login.lower() in [user.login.lower() for user in self.current_org_owners]:

{github_org_manager-0.7.12 → github_org_manager-0.7.14}/gh_org_mgr/_setup_team.py

@@ -90,7 +90,7 @@ def setup_team(
     # Come up with file name based on team name in the given config directory
     if not file_path:
         # Combine config dir and file name
-        file_path = str(Path(config_path) / "teams" / (slugify(team_name) + ".yaml"))  # type: ignore[arg-type]  # ty:ignore[invalid-argument-type]
+        file_path = str(Path(config_path) / "teams" / (slugify(team_name) + ".yaml"))  # ty:ignore[invalid-argument-type]
         logging.debug("Derived file path: %s", file_path)
 
     # Fill template

{github_org_manager-0.7.12 → github_org_manager-0.7.14}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "github-org-manager"
-version = "0.7.12"
+version = "0.7.14"
 description = "Manage a GitHub Organization, its teams, repository permissions, and more"
 requires-python = ">=3.10,<4"
 readme = "README.md"
@@ -33,7 +33,7 @@ dependencies = [
     "pygithub>=2.8.1,<3",
     "pyyaml>=6.0.3,<7",
     "requests>=2.32.5,<3",
-    "python-slugify>=8.0.4,<9",
+    "python-slugify>=9,<10",
     "jsonschema>=4.25.1,<5",
 ]
 

{github_org_manager-0.7.12 → github_org_manager-0.7.14}/pyproject.toml.orig

@@ -4,7 +4,7 @@
 
 [project]
 name = "github-org-manager"
-version = "0.7.12"
+version = "0.7.14"
 description = "Manage a GitHub Organization, its teams, repository permissions, and more"
 authors = [{ name = "Max Mehl", email = "max.mehl@deutschebahn.com" }]
 requires-python = ">=3.10,<4"
@@ -35,7 +35,7 @@ dependencies = [
     "pygithub>=2.8.1,<3",
     "pyyaml>=6.0.3,<7",
     "requests>=2.32.5,<3",
-    "python-slugify>=8.0.4,<9",
+    "python-slugify>=9,<10",
     "jsonschema>=4.25.1,<5",
 ]