Skip to content

Commit 5cae31e

Browse files
authored
Use list unpacking operator for distro lists (#1350)
1 parent b702797 commit 5cae31e

File tree

1 file changed

+42
-44
lines changed

1 file changed

+42
-44
lines changed

.evergreen/config_generator/etc/distros.py

Lines changed: 42 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,10 @@ def ls_distro(name, **kwargs):
4646
Distro(name=f'{name}-small', size='small', **kwargs),
4747
]
4848

49-
# See: https://evergreen.mongodb.com/distros
50-
# pylint: disable=line-too-long
51-
#fmt: off
52-
DEBIAN_DISTROS = [] + \
53-
ls_distro(name='debian12-latest', os='debian', os_type='linux', os_ver='latest') + \
54-
[]
49+
50+
DEBIAN_DISTROS = [
51+
*ls_distro(name='debian12-latest', os='debian', os_type='linux', os_ver='latest'),
52+
]
5553

5654
MACOS_DISTROS = [
5755
Distro(name='macos-14', os='macos', os_type='macos', os_ver='14'),
@@ -61,52 +59,52 @@ def ls_distro(name, **kwargs):
6159
Distro(name='macos-14-arm64', os='macos', os_type='macos', os_ver='14', arch='arm64'),
6260
]
6361

64-
RHEL_DISTROS = [] + \
65-
ls_distro(name='rhel80', os='rhel', os_type='linux', os_ver='8.0') + \
66-
ls_distro(name='rhel95', os='rhel', os_type='linux', os_ver='9.5') + \
67-
[]
62+
RHEL_DISTROS = [
63+
*ls_distro(name='rhel80', os='rhel', os_type='linux', os_ver='8.0'),
64+
*ls_distro(name='rhel95', os='rhel', os_type='linux', os_ver='9.5'),
65+
]
6866

69-
RHEL_ARM64_DISTROS = [] + \
70-
ls_distro(name='rhel92-arm64', os='rhel', os_type='linux', os_ver='9.2', arch='arm64') + \
71-
[]
67+
RHEL_ARM64_DISTROS = [
68+
*ls_distro(name='rhel92-arm64', os='rhel', os_type='linux', os_ver='9.2', arch='arm64'),
69+
]
7270

73-
RHEL_POWER8_DISTROS = [] + \
74-
ls_distro(name='rhel8-power', os='rhel', os_type='linux', os_ver='8', arch='power8') + \
75-
[]
71+
RHEL_POWER8_DISTROS = [
72+
*ls_distro(name='rhel8-power', os='rhel', os_type='linux', os_ver='8', arch='power8'),
73+
]
7674

77-
RHEL_ZSERIES_DISTROS = [] + \
78-
ls_distro(name='rhel7-zseries', os='rhel', os_type='linux', os_ver='7', arch='zseries') + \
79-
ls_distro(name='rhel8-zseries', os='rhel', os_type='linux', os_ver='8', arch='zseries') + \
80-
[]
75+
RHEL_ZSERIES_DISTROS = [
76+
*ls_distro(name='rhel7-zseries', os='rhel', os_type='linux', os_ver='7', arch='zseries'),
77+
*ls_distro(name='rhel8-zseries', os='rhel', os_type='linux', os_ver='8', arch='zseries'),
78+
]
8179

82-
UBUNTU_DISTROS = [] + \
83-
ls_distro(name='ubuntu2204', os='ubuntu', os_type='linux', os_ver='22.04') + \
84-
[]
80+
UBUNTU_DISTROS = [
81+
*ls_distro(name='ubuntu2204', os='ubuntu', os_type='linux', os_ver='22.04'),
82+
]
8583

86-
UBUNTU_ARM64_DISTROS = [] + \
87-
ls_distro(name='ubuntu2004-arm64', os='ubuntu', os_type='linux', os_ver='20.04', arch='arm64') + \
88-
ls_distro(name='ubuntu2204-arm64', os='ubuntu', os_type='linux', os_ver='22.04', arch='arm64') + \
89-
[]
84+
UBUNTU_ARM64_DISTROS = [
85+
*ls_distro(name='ubuntu2004-arm64', os='ubuntu', os_type='linux', os_ver='20.04', arch='arm64'),
86+
*ls_distro(name='ubuntu2204-arm64', os='ubuntu', os_type='linux', os_ver='22.04', arch='arm64'),
87+
]
9088

91-
WINDOWS_DISTROS = [] + \
92-
ls_distro(name='windows-64-vs2015', os='windows', os_type='windows', vs_ver='2015') + \
93-
ls_distro(name='windows-vsCurrent', os='windows', os_type='windows', vs_ver='vsCurrent') + \
94-
[]
95-
#fmt: on
96-
# pylint: enable=line-too-long
89+
WINDOWS_DISTROS = [
90+
*ls_distro(name='windows-64-vs2015', os='windows', os_type='windows', vs_ver='2015'),
91+
*ls_distro(name='windows-vsCurrent', os='windows', os_type='windows', vs_ver='vsCurrent'),
92+
]
9793

94+
# See: https://evergreen.mongodb.com/distros
9895
# Ensure no-arch distros are ordered before arch-specific distros.
99-
ALL_DISTROS = [] + \
100-
DEBIAN_DISTROS + \
101-
MACOS_DISTROS + \
102-
MACOS_ARM64_DISTROS + \
103-
RHEL_DISTROS + \
104-
RHEL_ARM64_DISTROS + \
105-
RHEL_POWER8_DISTROS + \
106-
RHEL_ZSERIES_DISTROS + \
107-
UBUNTU_DISTROS + \
108-
UBUNTU_ARM64_DISTROS + \
109-
WINDOWS_DISTROS
96+
ALL_DISTROS = [
97+
*DEBIAN_DISTROS,
98+
*MACOS_DISTROS,
99+
*MACOS_ARM64_DISTROS,
100+
*RHEL_DISTROS,
101+
*RHEL_ARM64_DISTROS,
102+
*RHEL_POWER8_DISTROS,
103+
*RHEL_ZSERIES_DISTROS,
104+
*UBUNTU_DISTROS,
105+
*UBUNTU_ARM64_DISTROS,
106+
*WINDOWS_DISTROS,
107+
]
110108

111109

112110
def find_distro(name) -> Distro:

0 commit comments

Comments
 (0)