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
1 change: 1 addition & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ jobs:
- uses: msys2/setup-msys2@v2
with:
msystem: ${{matrix.sys}}
update: true
install: |
mingw-w64-${{matrix.env}}-toolchain
mingw-w64-${{matrix.env}}-python
Expand Down
20 changes: 12 additions & 8 deletions distutils/tests/test_filelist.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import logging
import os
import re
import sys
from distutils import debug, filelist
from distutils.errors import DistutilsTemplateError
from distutils.filelist import FileList, glob_to_re, translate_pattern
Expand Down Expand Up @@ -49,18 +50,21 @@ def test_glob_to_re(self):
if os.sep == '\\':
sep = re.escape(os.sep)

# https://docs.python.org/3/whatsnew/3.14.html#re
end = r"\z" if sys.version_info >= (3, 14) else r"\Z"

for glob, regex in (
# simple cases
('foo*', r'(?s:foo[^%(sep)s]*)\Z'),
('foo?', r'(?s:foo[^%(sep)s])\Z'),
('foo??', r'(?s:foo[^%(sep)s][^%(sep)s])\Z'),
('foo*', r'(?s:foo[^%(sep)s]*)%(end)s'),
('foo?', r'(?s:foo[^%(sep)s])%(end)s'),
('foo??', r'(?s:foo[^%(sep)s][^%(sep)s])%(end)s'),
# special cases
(r'foo\\*', r'(?s:foo\\\\[^%(sep)s]*)\Z'),
(r'foo\\\*', r'(?s:foo\\\\\\[^%(sep)s]*)\Z'),
('foo????', r'(?s:foo[^%(sep)s][^%(sep)s][^%(sep)s][^%(sep)s])\Z'),
(r'foo\\??', r'(?s:foo\\\\[^%(sep)s][^%(sep)s])\Z'),
(r'foo\\*', r'(?s:foo\\\\[^%(sep)s]*)%(end)s'),
(r'foo\\\*', r'(?s:foo\\\\\\[^%(sep)s]*)%(end)s'),
('foo????', r'(?s:foo[^%(sep)s][^%(sep)s][^%(sep)s][^%(sep)s])%(end)s'),
(r'foo\\??', r'(?s:foo\\\\[^%(sep)s][^%(sep)s])%(end)s'),
):
regex = regex % {'sep': sep}
regex = regex % {'sep': sep, 'end': end}
assert glob_to_re(glob) == regex

def test_process_template_line(self):
Expand Down
2 changes: 2 additions & 0 deletions distutils/tests/test_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
get_host_platform,
get_platform,
grok_environment_error,
is_mingw,
rfc822_escape,
split_quoted,
strtobool,
Expand All @@ -42,6 +43,7 @@ def environment(monkeypatch):

@pytest.mark.usefixtures('save_env')
class TestUtil:
@pytest.mark.skipif(is_mingw(), reason="mingw has non-standard platform names")
def test_get_host_platform(self):
with mock.patch('os.name', 'nt'):
with mock.patch('sys.version', '... [... (ARM64)]'):
Expand Down
2 changes: 2 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ doc = [
check = [
"pytest-checkdocs >= 2.4",
"pytest-ruff >= 0.2.1; sys_platform != 'cygwin'",
"ruff == 0.13.3; sys_platform != 'cygwin'",
]

cover = [
Expand All @@ -80,6 +81,7 @@ enabler = [
type = [
# upstream
"pytest-mypy",
"mypy == 1.15.0",

# local
"types-docutils",
Expand Down
Loading