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.

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

feat: Preliminary support for Python 3.13 #3200

Merged
merged 10 commits into from
Jul 16, 2024
Merged

Conversation

sentrivana
Copy link
Contributor

@sentrivana sentrivana commented Jun 25, 2024

No RC yet, just beta releases, but we can already start setting stuff up.

3.13 release schedule: https://peps.python.org/pep-0719/#schedule

@sentrivana sentrivana changed the title Test against Python 3.13 tests: Test against Python 3.13 Jun 25, 2024
…on 3.13) (#3272)

The `_partialmethod` attribute of methods wrapped with `partialmethod()`
was renamed to `__partialmethod__` in CPython 3.13:
python/cpython#16600
…3271)

Starting from Python 3.13, `frame.f_locals` is not `dict` anymore, but
`FrameLocalsProxy`, that cannot be copied using `copy.copy()`. In Python
3.13 and later, it should be copied using a method `.copy()`. The new way
of copying works the same as the old one for versions of Python prior to
3.13, according to the documentation (both copying methods produce a
shallow copy).

Since Python 3.13, `FrameLocalsProxy` skips items of `locals()` that have
non-`str` keys; this is a CPython implementation detail, so we hence
disable `test_non_string_variables` test on Python 3.13.

See:
https://peps.python.org/pep-0667/
python/cpython#118921
python/cpython#118923
https://docs.python.org/3.13/whatsnew/3.13.html#porting-to-python-3-13
https://docs.python.org/3/library/copy.html
https://github.com/python/cpython/blame/7b413952e817ae87bfda2ac85dd84d30a6ce743b/Objects/frameobject.c#L148
@sentrivana sentrivana linked an issue Jul 16, 2024 that may be closed by this pull request
@sentrivana sentrivana changed the title tests: Test against Python 3.13 feat: Support Python 3.13 Jul 16, 2024
@sentrivana sentrivana changed the title feat: Support Python 3.13 feat: Preliminary support for Python 3.13 Jul 16, 2024
@sentrivana sentrivana marked this pull request as ready for review July 16, 2024 13:41
Copy link
Member

@szokeasaurusrex szokeasaurusrex left a comment

Choose a reason for hiding this comment

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

Do these allow-prereleases: true have any affect on non-3.13 tests? I would be hesitant to merge this if so

Edit: Just noticed the "Do not merge" label, is that still accurate?

Copy link
Member

@antonpirker antonpirker left a comment

Choose a reason for hiding this comment

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

🔥

@@ -611,7 +610,7 @@ def serialize_frame(
)

if include_local_variables:
rv["vars"] = copy(frame.f_locals)
rv["vars"] = frame.f_locals.copy()
Copy link
Member

Choose a reason for hiding this comment

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

why this change?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This commit has the details.

Copy link
Member

Choose a reason for hiding this comment

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

^ Basically, frame.f_locals is no longer a dict in 3.13

@sentrivana
Copy link
Contributor Author

Do these allow-prereleases: true have any affect on non-3.13 tests? I would be hesitant to merge this if so

Will double check this.

Edit: Just noticed the "Do not merge" label, is that still accurate?

No, removed now, thanks for noticing!

Copy link

codecov bot commented Jul 16, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 79.46%. Comparing base (cf8e37f) to head (e2eb799).

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #3200      +/-   ##
==========================================
+ Coverage   79.45%   79.46%   +0.01%     
==========================================
  Files         133      133              
  Lines       14290    14290              
  Branches     3004     3004              
==========================================
+ Hits        11354    11356       +2     
+ Misses       2091     2089       -2     
  Partials      845      845              
Files Coverage Δ
sentry_sdk/utils.py 82.64% <100.00%> (+0.37%) ⬆️

... and 1 file with indirect coverage changes

@sentrivana
Copy link
Contributor Author

@szokeasaurusrex allow-prereleases will only kick in if the specified Python version is not generally available (all older Python versions are, so no effect there), see here.

Copy link
Member

@szokeasaurusrex szokeasaurusrex left a comment

Choose a reason for hiding this comment

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

nice!

@sentrivana sentrivana merged commit a98f660 into master Jul 16, 2024
125 checks passed
@sentrivana sentrivana deleted the ivana/python-3.13 branch July 16, 2024 14:10
arjennienhuis pushed a commit to arjennienhuis/sentry-python that referenced this pull request Sep 30, 2024
Adding preliminary support for Python 3.13.

The `_partialmethod` attribute of methods wrapped with `partialmethod()`
was renamed to `__partialmethod__` in CPython 3.13:
python/cpython#16600

Starting from Python 3.13, `frame.f_locals` is not `dict` anymore, but
`FrameLocalsProxy`, that cannot be copied using `copy.copy()`. In Python
3.13 and later, it should be copied using a method `.copy()`. The new way
of copying works the same as the old one for versions of Python prior to
3.13, according to the documentation (both copying methods produce a
shallow copy).

Since Python 3.13, `FrameLocalsProxy` skips items of `locals()` that have
non-`str` keys; this is a CPython implementation detail, so we hence
disable `test_non_string_variables` test on Python 3.13.

See:
https://peps.python.org/pep-0667/
python/cpython#118921
python/cpython#118923
https://docs.python.org/3.13/whatsnew/3.13.html#porting-to-python-3-13
https://docs.python.org/3/library/copy.html
https://github.com/python/cpython/blame/7b413952e817ae87bfda2ac85dd84d30a6ce743b/Objects/frameobject.c#L148

---------

Co-authored-by: Roman Inflianskas <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support Python 3.13 (coming Oct 2024)
4 participants