Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Python 3.13 (beta) support #12334

Merged
merged 2 commits into from
May 19, 2024
Merged

Add Python 3.13 (beta) support #12334

merged 2 commits into from
May 19, 2024

Conversation

bluetech
Copy link
Member

Fix #12323

@bluetech bluetech mentioned this pull request May 17, 2024
Closed
bluetech
bluetech commented May 17, 2024
View reviewed changes
src/_pytest/pytester.py
@@ -289,7 +289,8 @@ def assert_contains(self, entries: Sequence[Tuple[str, str]]) -> None:
__tracebackhide__ = True
i = 0
entries = list(entries)
backlocals = sys._getframe(1).f_locals
# Since Python 3.13, f_locals is not a dict, but eval requires a dict.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://discuss.python.org/t/pep-667-consistent-views-of-namespaces/46631/36

bluetech
bluetech commented May 17, 2024
View reviewed changes
src/_pytest/pytester.py
@@ -760,6 +761,9 @@ def _makefile(
) -> Path:
items = list(files.items())

if ext is None:
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

python/cpython#119113

@bluetech
Copy link
Member Author

One remaining failure, on windows:

 ________________________ test_cache_reportheader[env1] ________________________

env = ('TOX_ENV_DIR', '/tox_env_dir')
pytester = <Pytester WindowsPath('C:/Users/runneradmin/AppData/Local/Temp/pytest-of-unknown/pytest-0/test_cache_reportheader1')>
monkeypatch = <_pytest.monkeypatch.MonkeyPatch object at 0x00000209B926A120>

    @pytest.mark.parametrize("env", ((), ("TOX_ENV_DIR", "/tox_env_dir")))
    def test_cache_reportheader(
        env: Sequence[str], pytester: Pytester, monkeypatch: MonkeyPatch
    ) -> None:
        pytester.makepyfile("""def test_foo(): pass""")
        if env:
            monkeypatch.setenv(*env)
            expected = os.path.join(env[1], ".pytest_cache")
        else:
            monkeypatch.delenv("TOX_ENV_DIR", raising=False)
            expected = ".pytest_cache"
        result = pytester.runpytest("-v")
>       result.stdout.fnmatch_lines([f"cachedir: {expected}"])
E       Failed: nomatch: 'cachedir: /tox_env_dir\\.pytest_cache'
E           and: '============================= test session starts ============================='
E           and: 'platform win32 -- Python 3.13.0b1, pytest-8.3.0.dev49+g87c7a72ce, pluggy-1.5.0 -- D:\\a\\pytest\\pytest\\.tox\\py313\\Scripts\\python.EXE'
E           and: 'cachedir: C:\\tox_env_dir\\.pytest_cache'
E           and: 'rootdir: C:\\Users\\runneradmin\\AppData\\Local\\Temp\\pytest-of-unknown\\pytest-0\\test_cache_reportheader1'
E           and: 'collecting ... collected 1 item'
E           and: ''
E           and: 'test_cache_reportheader.py::test_foo PASSED                              [100%]'
E           and: ''
E           and: '============================== 1 passed in 0.01s =============================='
E       remains unmatched: 'cachedir: /tox_env_dir\\.pytest_cache'

Probably something in os.path/pathlib changed.

@RonnyPfannschmidt
Copy link
Member

Seems like its normalized/resolved now, so the env name is no longer correct

@bluetech
testing: remove conditionals for Python 3.11 beta releases
dbee3fa 
No need to support beta releases of an older version anymore.

Ref: 09b2c95
@bluetech
Copy link
Member Author

I don't know if the C:\ is correct or not, and I don't have windows handy, but since it's only for display, and probably tox doesn't issue such env dir path on windows anyway, so decided to sidestep the issue in the test.

This is ready for review, I'll also backport it for 8.2.1.

@bluetech bluetech marked this pull request as ready for review May 18, 2024 16:55
@bluetech bluetech changed the title WIP: Add Python 3.13 (beta) support Add Python 3.13 (beta) support May 18, 2024
nicoddemus
nicoddemus approved these changes May 18, 2024
View reviewed changes
Copy link
Member

@nicoddemus nicoddemus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great, thanks for tackling this!

src/_pytest/pytester.py
@@ -760,6 +761,9 @@ def _makefile(
) -> Path:
items = list(files.items())

if ext is None:
Copy link
Member

@nicoddemus nicoddemus May 18, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's leave a note here:

Suggested change
if ext is None:
# https://github.com/python/cpython/issues/119113
if ext is None:

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think it's necessary, since I think we better not rely on it and just keep the check.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see what harm a small comment like that could cause either, but OK.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also in that case, we probably should change the signature as well, so we have the typing match the runtime behavior.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The type is ext: str which is correct. The callers have some *args, **kwargs forwarding which is somewhat annoying to type.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well OK, this is no big deal anyway.

testing/code/test_excinfo.py
@@ -373,7 +374,10 @@ def test_excinfo_no_sourcecode():
except ValueError:
excinfo = _pytest._code.ExceptionInfo.from_current()
s = str(excinfo.traceback[-1])
assert s == " File '<string>':1 in <module>\n ???\n"
# TODO: Since Python 3.13b1 under pytest-xdist, the * is `import
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think so.

nicoddemus
nicoddemus reviewed May 18, 2024
View reviewed changes
changelog/12334.bugfix.rst Outdated
@@ -0,0 +1 @@
Support for Python 3.13 (beta1 at the time of writing).
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would categorize this as a feature actually.

@bluetech bluetech merged commit c1d623c into pytest-dev:main May 19, 2024
27 checks passed
@bluetech bluetech deleted the py313 branch May 19, 2024 06:45
@github-actions github-actions bot mentioned this pull request May 19, 2024
Merged
@data-sync-user data-sync-user mentioned this pull request Jun 3, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nicoddemus nicoddemus nicoddemus approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Test failures on Python 3.13.0b1
3 participants
@bluetech @RonnyPfannschmidt @nicoddemus