Skip to content

Commit

Permalink
bug-1870734: update eliot to python 3.11
Browse files Browse the repository at this point in the history
  • Loading branch information
relud committed Dec 19, 2023
1 parent c534d29 commit bb8d0f4
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 41 deletions.
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.10.13-slim-bullseye@sha256:0749fe26b9b76ddf1eb081d7c10ab44cc2ba5aa180ef39c887d0aa7f8026179c
FROM python:3.11.7-slim-bullseye@sha256:18faee15e9f6e5eaa7a4098e093a8513275a5075cfeae59091fae641cc703d1a

ARG userid=10001
ARG groupid=10001
Expand Down
2 changes: 1 addition & 1 deletion docker/images/fakesentry/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.10.8-alpine3.16@sha256:d17cfece24cb5d0432b37c138f307a19dd461b88aded1fc6981ef5c997c74de1
FROM python:3.11.7-alpine3.19@sha256:84271da1cd297b01dd4706e01e7789b08b54a5a512c0e3fcaf11c902640f5ebd

ARG groupid=5000
ARG userid=5000
Expand Down
8 changes: 5 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ line-length = 88
# Allow unused variables when underscore-prefixed.
dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"

# Assume Python 3.9.
target-version = "py39"
# Assume Python 3.11.
target-version = "py311"


[tool.black]
line-length = 88
target-version = ["py39"]
target-version = ["py311"]


[tool.pytest.ini_options]
Expand All @@ -43,6 +43,8 @@ addopts = "-rsxX --showlocals --tb=native -p no:cacheprovider --import-mode=impo
# Transform all warnings into errors
filterwarnings = [
"error",
# Falcon currently uses cgi which is going away in python 3.13
"ignore:'cgi' is deprecated and slated for removal in Python 3.13:DeprecationWarning",
# sentry-sdk has a Falcon integration that needs some help and is currently
# using a thing in Falcon that kicks up a DeprecatedWarning
"ignore:The api_helpers module.*:falcon.util.deprecation.DeprecatedWarning",
Expand Down
6 changes: 0 additions & 6 deletions requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,3 @@ sphinx-rtd-theme==2.0.0
symbolic==12.8.0
urllib3==2.1.0
werkzeug==3.0.1

# NOTE(willkg): We need this until we update to Python 3.10.
exceptiongroup==1.1.3
importlib-metadata==6.8.0
typing-extensions==4.8.0
zipp==3.17.0
31 changes: 2 additions & 29 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.10
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile --generate-hashes
Expand Down Expand Up @@ -140,12 +140,6 @@ everett==3.3.0 \
--hash=sha256:acb7b8f3c5fc9692a8ba14fb257e4649f87bea4856e7406c2e9b6c2cab889105 \
--hash=sha256:d3ecc55cc1bdf2408ca82bc8db5a3fc588fc4c0f236a6ab9599938f41970b814
# via -r requirements.in
exceptiongroup==1.1.3 \
--hash=sha256:097acd85d473d75af5bb98e41b61ff7fe35efe6675e4f9370ec6ec5126d160e9 \
--hash=sha256:343280667a4585d195ca1cf9cef84a4e178c4b6cf2274caef9859782b567d5e3
# via
# -r requirements.in
# pytest
falcon==3.1.1 \
--hash=sha256:00e6c6b3ec846193cfd30be26b10dbb7cc31ee3442f80f1d5ffd14c410619156 \
--hash=sha256:016fe952a526045292fb591f4c724d5fdf4127e88d0369e2dc147925dc51835c \
Expand Down Expand Up @@ -200,10 +194,6 @@ imagesize==1.3.0 \
--hash=sha256:1db2f82529e53c3e929e8926a1fa9235aa82d0bd0c580359c67ec31b2fddaa8c \
--hash=sha256:cd1750d452385ca327479d45b64d9c7729ecf0b3969a58148298c77092261f9d
# via sphinx
importlib-metadata==6.8.0 \
--hash=sha256:3ebb78df84a805d7698245025b975d9d67053cd94c79245ba4b3eb694abe68bb \
--hash=sha256:dbace7892d8c0c4ac1ad096662232f831d4e64f4c4545bd53016a3e9d4654743
# via -r requirements.in
iniconfig==1.1.1 \
--hash=sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3 \
--hash=sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32
Expand Down Expand Up @@ -595,18 +585,7 @@ symbolic==12.8.0 \
tomli==1.2.3 \
--hash=sha256:05b6166bff487dc068d322585c7ea4ef78deed501cc124060e0f238e89a9231f \
--hash=sha256:e3069e4be3ead9668e21cb9b074cd948f7b3113fd9c8bba083f48247aab8b11c
# via
# black
# build
# pep517
# pip-tools
# pytest
typing-extensions==4.8.0 \
--hash=sha256:8f92fc8806f9a6b641eaa5318da32b44d401efaac0f6678c9bc448ba3605faa0 \
--hash=sha256:df8e4339e9cb77357558cbdbceca33c303714cf861d1eef15e1070055ae8b7ef
# via
# -r requirements.in
# black
# via pep517
urllib3==2.1.0 \
--hash=sha256:55901e917a5896a349ff771be919f8bd99aff50b79fe58fec595eb37bbc56bb3 \
--hash=sha256:df7aa8afb0148fa78488e7899b2c59b5f4ffcfa82e6c54ccb9dd37c1d7b52d54
Expand All @@ -622,12 +601,6 @@ wheel==0.38.4 \
--hash=sha256:965f5259b566725405b05e7cf774052044b1ed30119b5d586b2703aafe8719ac \
--hash=sha256:b60533f3f5d530e971d6737ca6d58681ee434818fab630c83a734bb10c083ce8
# via pip-tools
zipp==3.17.0 \
--hash=sha256:0e923e726174922dce09c53c59ad483ff7bbb8e572e00c7f7c46b88556409f31 \
--hash=sha256:84e64a1c28cf7e91ed2078bb8cc8c259cb19b76942096c8d7b84947690cabaf0
# via
# -r requirements.in
# importlib-metadata

# WARNING: The following packages were not pinned, but pip requires them to be
# pinned when the requirements file includes hashes and the requirement is not
Expand Down
2 changes: 1 addition & 1 deletion tests/test_cache_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ def test_nested_directories(cm_client, tmpdir):
"num_unhandled_errors": "0",
"event": ["1", "256", "0", "'xul__4byte.symc'"],
"event_flags": ["<flags.CREATE: 256>"],
"flags_list": "'flags.CREATE'",
"flags_list": "'256'",
"dir_path": ANY,
"path": ANY,
},
Expand Down

0 comments on commit bb8d0f4

Please sign in to comment.