Skip to content

Commit 3ce92f2

Browse files
committed
email _all_ the maintainers
1 parent 7436f50 commit 3ce92f2

File tree

4 files changed

+30
-0
lines changed

4 files changed

+30
-0
lines changed

tests/unit/forklift/test_legacy.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@
3737
OrganizationFactory,
3838
OrganizationProjectFactory,
3939
OrganizationRoleFactory,
40+
TeamFactory,
41+
TeamProjectRoleFactory,
42+
TeamRoleFactory,
4043
)
4144
from warehouse.admin.flags import AdminFlag, AdminFlagValue
4245
from warehouse.classifiers.models import Classifier
@@ -3752,6 +3755,14 @@ def test_egg_upload_sends_pep_715_notice_org_roles(
37523755
org_owner = UserFactory.create()
37533756
OrganizationRoleFactory.create(user=org_owner, organization=org)
37543757

3758+
org_member = UserFactory.create()
3759+
OrganizationRoleFactory.create(
3760+
user=org_member, organization=org, role_name="Member"
3761+
)
3762+
team = TeamFactory.create(organization=org)
3763+
TeamRoleFactory.create(team=team, user=org_member)
3764+
TeamProjectRoleFactory.create(project=project, team=team)
3765+
37553766
pyramid_config.testing_securitypolicy(identity=user)
37563767
db_request.user = user
37573768
db_request.user_agent = "warehouse-tests/6.6.6"
@@ -3787,6 +3798,7 @@ def test_egg_upload_sends_pep_715_notice_org_roles(
37873798
assert set(send_email.calls) == {
37883799
pretend.call(db_request, user, project_name=project.name),
37893800
pretend.call(db_request, org_owner, project_name=project.name),
3801+
pretend.call(db_request, org_member, project_name=project.name),
37903802
}
37913803

37923804

tests/unit/packaging/test_tasks.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@
2727
OrganizationFactory,
2828
OrganizationProjectFactory,
2929
OrganizationRoleFactory,
30+
TeamFactory,
31+
TeamProjectRoleFactory,
32+
TeamRoleFactory,
3033
)
3134
from warehouse.accounts.models import WebAuthn
3235
from warehouse.packaging import tasks
@@ -978,6 +981,14 @@ def test_send_pep_715_notices(db_request, monkeypatch):
978981
some_egg_org_owner = UserFactory.create()
979982
OrganizationRoleFactory.create(user=some_egg_org_owner, organization=some_egg_org)
980983

984+
some_egg_org_member = UserFactory.create()
985+
OrganizationRoleFactory.create(
986+
user=some_egg_org_member, organization=some_egg_org, role_name="Member"
987+
)
988+
some_egg_team = TeamFactory.create(organization=some_egg_org)
989+
TeamRoleFactory.create(team=some_egg_team, user=some_egg_org_member)
990+
TeamProjectRoleFactory.create(project=some_egg_project, team=some_egg_team)
991+
981992
some_egg_release = ReleaseFactory.create(project=some_egg_project)
982993
FileFactory(
983994
release=some_egg_release, packagetype="bdist_wheel", upload_time="2022-06-01"
@@ -1037,6 +1048,9 @@ def test_send_pep_715_notices(db_request, monkeypatch):
10371048
pretend.call(
10381049
db_request, some_egg_org_owner, project_name=some_egg_project.name
10391050
),
1051+
pretend.call(
1052+
db_request, some_egg_org_member, project_name=some_egg_project.name
1053+
),
10401054
pretend.call(
10411055
db_request, another_egg_project_owner, project_name=another_egg_project.name
10421056
),

warehouse/forklift/legacy.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1480,6 +1480,8 @@ def file_upload(request):
14801480
contributors = project.users
14811481
if project.organization:
14821482
contributors += project.organization.owners
1483+
for teamrole in project.team_project_roles:
1484+
contributors += teamrole.team.members
14831485

14841486
for contributor in sorted(contributors):
14851487
send_egg_uploads_deprecated_email(

warehouse/packaging/tasks.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -527,6 +527,8 @@ def send_pep_715_notices(request):
527527
contributors = project.users
528528
if project.organization:
529529
contributors += project.organization.owners
530+
for teamrole in project.team_project_roles:
531+
contributors += teamrole.team.members
530532

531533
for contributor in sorted(contributors):
532534
send_egg_uploads_deprecated_initial_email(

0 commit comments

Comments
 (0)