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

bug-1811299: update eliot to python 3.10 #106

Merged
merged 1 commit into from
Dec 5, 2023
Merged
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
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.9.16-slim@sha256:e23b65d2ed7cbb4f9975bcc46421470ca670e8e47744fe4b03eb94d39311ad24
FROM python:3.10.13-slim-bullseye@sha256:0749fe26b9b76ddf1eb081d7c10ab44cc2ba5aa180ef39c887d0aa7f8026179c

ARG userid=10001
ARG groupid=10001
Expand Down
6 changes: 2 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.9
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile --generate-hashes
Expand Down Expand Up @@ -203,9 +203,7 @@ imagesize==1.3.0 \
importlib-metadata==6.8.0 \
--hash=sha256:3ebb78df84a805d7698245025b975d9d67053cd94c79245ba4b3eb694abe68bb \
--hash=sha256:dbace7892d8c0c4ac1ad096662232f831d4e64f4c4545bd53016a3e9d4654743
# via
# -r requirements.in
# sphinx
# via -r requirements.in
iniconfig==1.1.1 \
--hash=sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3 \
--hash=sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32
Expand Down
13 changes: 1 addition & 12 deletions tests/test_sentry.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,18 +59,7 @@
"module": "falcon.app",
"post_context": ANY,
"pre_context": ANY,
"vars": {
"__builtins__": "<module 'builtins' (built-in)>",
"__doc__": "'Falcon App class.'",
"__file__": ANY,
"__loader__": ANY,
"__name__": "'falcon.app'",
"__package__": "'falcon'",
"__spec__": ANY,
"iscoroutinefunction": ANY,
"re": "<module 're' from '/usr/local/lib/python3.9/re.py'>",
"wraps": ANY,
},
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm not sure why updating Python caused this change and didn't look into it.

Copy link
Contributor

Choose a reason for hiding this comment

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

I don't know how the sentry package extracts the local variables, but my guess is they copy f_locals from the frame object. That has always been one of the weirder corners of Python, or at least since local variables aren't dictionaries anymore, so since the 2.0 release? Updates to f_locals are not reflected in local variables, and updates to local variables are not always reflected in f_locals as well.

I'm not surprised that this kind of change can happen when upgrading Python, and I don't think we care.

"vars": {},
},
{
"abs_path": "/app/eliot/health_resource.py",
Expand Down