Skip to content

Commit cfd8b7e

Browse files
committed
Use modern GitHub API to read team members
The old API was deprecated a while ago, and while I couldn't find notices of it being sunset or affected by brownouts right now, I do notice that it has stopped working currently — whether that's temporary or permanent I don't know, but it doesn't hurt to merge this improvement. Closes: #135 Signed-off-by: Clemens Lang <[email protected]>
1 parent 6db10e4 commit cfd8b7e

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

runtests.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1528,8 +1528,8 @@ def test_006_normal_operation(self):
15281528
"slug": u"gentlepeople"
15291529
}
15301530
],
1531-
'/teams/1/members': team1members,
1532-
'/teams/12/members': team12members
1531+
'/organizations/%s/team/1/members' % self.organization: team1members,
1532+
'/organizations/%s/team/12/members' % self.organization: team12members
15331533
})
15341534

15351535
with TracContext(self, env=self.tracd_env_debug, **self.trac_env):
@@ -1711,8 +1711,8 @@ def test_012_hook_membership_event_delete_team(self):
17111711
"slug": u"gentlepeople"
17121712
}
17131713
],
1714-
'/teams/1/members': team1members,
1715-
'/teams/12/members': team12members
1714+
'/organizations/%s/team/1/members' % self.organization: team1members,
1715+
'/organizations/%s/team/12/members' % self.organization: team12members
17161716
})
17171717

17181718
update = {
@@ -1744,7 +1744,7 @@ def test_012_hook_membership_event_delete_team(self):
17441744
"slug": u"gentlepeople"
17451745
}
17461746
],
1747-
'/teams/12/members': team12members
1747+
'/organizations/%s/team/12/members' % self.organization: team12members
17481748
})
17491749

17501750
# Send the delete event
@@ -1829,7 +1829,7 @@ def test_014_hook_membership_event_add_team(self):
18291829
"slug": u"justice-league"
18301830
},
18311831
],
1832-
'/teams/1/members': team1members,
1832+
'/organizations/%s/team/1/members' % self.organization: team1members,
18331833
})
18341834

18351835
# Send the update event
@@ -1872,7 +1872,7 @@ def test_015_hook_membership_event_add_member(self):
18721872
"slug": u"justice-league"
18731873
},
18741874
],
1875-
'/teams/1/members': list(team1members)
1875+
'/organizations/%s/team/1/members' % self.organization: list(team1members)
18761876
})
18771877

18781878
update = {
@@ -1894,7 +1894,7 @@ def test_015_hook_membership_event_add_member(self):
18941894
"slug": u"justice-league"
18951895
},
18961896
],
1897-
'/teams/1/members': list(team1members)
1897+
'/organizations/%s/team/1/members' % self.organization: list(team1members)
18981898
})
18991899

19001900
# Send the update event
@@ -1937,7 +1937,7 @@ def test_016_hook_membership_event_remove_member(self):
19371937
"slug": u"justice-league"
19381938
},
19391939
],
1940-
'/teams/1/members': list(team1members)
1940+
'/organizations/%s/team/1/members' % self.organization: list(team1members)
19411941
})
19421942

19431943
update = {
@@ -1959,7 +1959,7 @@ def test_016_hook_membership_event_remove_member(self):
19591959
"slug": u"justice-league"
19601960
},
19611961
],
1962-
'/teams/1/members': list(team1members)
1962+
'/organizations/%s/team/1/members' % self.organization: list(team1members)
19631963
})
19641964

19651965
# Send the update event

tracext/github/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,11 +475,12 @@ def __init__(self, api, env, org, teamid, slug): # pylint: disable=too-many-argu
475475
:param slug: the GitHub team shortname in URL representation
476476
"""
477477
self._teamid = teamid
478+
self._orgid = org
478479
fullname = '-'.join(['github', org, slug])
479480
super(GitHubTeam, self).__init__(api, env, fullname)
480481

481482
def _apicall_parameters(self):
482-
return ("teams/{}/members", self._teamid)
483+
return ("organizations/{}/team/{}/members", self._orgid, self._teamid)
483484

484485
#class GitHubOrgMembers(GitHubUserCollection):
485486
# """

0 commit comments

Comments
 (0)