Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions src/check_python_versions/sources/tox.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def parse_envlist(envlist: str) -> list[str]:


def brace_expand(s: str) -> list[str]:
"""Expand a braced group.
"""Expand a braced group, including closed numeric ranges.

E.g. brace_expand('a{1,2}{b,c}x') == ['a1bx', 'a1cx', 'a2bx', 'a2cx'].

Expand All @@ -88,7 +88,13 @@ def brace_expand(s: str) -> list[str]:
right = m.group(3)
res = []
for alt in m.group(2).split(','):
res += brace_expand(left + alt.strip() + right)
alternatives: Iterable[str] = (alt.strip(),)
if numeric_range := re.fullmatch(r'\s*(\d+)-(\d+)', alt):
first, last = map(int, numeric_range.groups())
step = 1 if first <= last else -1
alternatives = map(str, range(first, last + step, step))
for value in alternatives:
res += brace_expand(left + value + right)
return res


Expand Down Expand Up @@ -177,11 +183,14 @@ def update_tox_envlist(envlist: str, new_versions: SortedVersionList) -> str:
# Try to preserve braced groups
parts = []
added_vers = False
# Tox requires the range end to touch its comma or closing brace.
version_item = r'\s*(?:\d+-\d+|(?:\d+|py\d*)\s*)'
python_braces = (
r'(py[{]' + version_item + r'(?:,' + version_item
+ r')*[}])(?P<rest>.*)'
)
for part in split_envlist(envlist):
m = re.match(
r'(py[{](?:\d+|py\d*)(?:,(?:\d+|py\d*))*[}])(?P<rest>.*)',
part
)
m = re.match(python_braces, part)
if m:
keep = [env for env in brace_expand(m.group(1))
if should_keep(env, new_versions)]
Expand Down
30 changes: 30 additions & 0 deletions tests/sources/test_tox.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ def test_get_tox_ini_python_versions_no_tox_envlist(tmp_path):
('py36, py37', ['py36', 'py37']),
('\n py36,\n py37', ['py36', 'py37']),
('py3{6,7},pypy', ['py36', 'py37', 'pypy']),
('py3{8-10,12},pypy3', ['py38', 'py39', 'py310', 'py312', 'pypy3']),
('py{35, 36, 37, 38, py3}', ['py35', 'py36', 'py37', 'py38', 'pypy3']),
])
def test_parse_envlist(s, expected):
Expand All @@ -83,6 +84,21 @@ def test_parse_envlist(s, expected):
('py3{6, 7}', ['py36', 'py37']),
('py3{6 ,7}', ['py36', 'py37']),
('py3{6 , 7}', ['py36', 'py37']),
('py3{8-10}', ['py38', 'py39', 'py310']),
('py3{12-9}', ['py312', 'py311', 'py310', 'py39']),
('py3{11-11}', ['py311']),
('py3{08-10}', ['py38', 'py39', 'py310']),
('py3{ 8-10}', ['py38', 'py39', 'py310']),
('py3{8-10 }', ['py38-10']),
('py3.{9-10}', ['py3.9', 'py3.10']),
('py38-40', ['py38-40']),
('{lint-1-2,docs}', ['lint-1-2', 'docs']),
(
'py3{9-10,12}-django{40-41,50}',
['py39-django40', 'py39-django41', 'py39-django50',
'py310-django40', 'py310-django41', 'py310-django50',
'py312-django40', 'py312-django41', 'py312-django50'],
),
])
def test_brace_expand(s, expected):
assert brace_expand(s) == expected
Expand Down Expand Up @@ -226,3 +242,17 @@ def test_update_tox_envlist_with_newlines(s, expected):
def test_update_tox_envlist_with_braces(s, expected):
result = update_tox_envlist(s, v(['3.6', '3.7']))
assert result == expected


@pytest.mark.parametrize('envlist, versions, expected', [
('py3{8-11},pypy3,lint', ['3.8', '3.9', '3.10', '3.11', '3.12'],
'py38,py39,py310,py311,py312,pypy3,lint'),
('py{38-39,310-311}-django{40-41},lint', ['3.9', '3.10', '3.12'],
'py{39,310,312}-django{40-41},lint'),
('py{38-39, 310-311}-django{41-40,50},lint', ['3.9', '3.10', '3.12'],
'py{39,310,312}-django{41-40,50},lint'),
('py{38 , 39, 310-311}-django{41-40,50},lint', ['3.9', '3.10', '3.12'],
'py{39,310,312}-django{41-40,50},lint'),
])
def test_update_tox_envlist_with_ranges(envlist, versions, expected):
assert update_tox_envlist(envlist, v(versions)) == expected
Loading