Skip to content

Commit f135866

Browse files
committed
[INTPROD-9211] Python 3.10 Update
1 parent 744b246 commit f135866

File tree

9 files changed

+168
-103
lines changed

9 files changed

+168
-103
lines changed

.pre-commit-config.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
exclude: '^docs/.*$'
22
default_language_version:
3-
python: python3.8
3+
python: python3.10
44
repos:
55
- repo: https://github.com/pre-commit/pre-commit-hooks
66
rev: v4.4.0
@@ -24,7 +24,7 @@ repos:
2424
rev: v3.9.0
2525
hooks:
2626
- id: reorder-python-imports
27-
args: [--py38-plus]
27+
args: ['--py310-plus']
2828
- repo: https://github.com/asottile/add-trailing-comma
2929
rev: v2.4.0
3030
hooks:
@@ -34,7 +34,7 @@ repos:
3434
rev: v3.3.1
3535
hooks:
3636
- id: pyupgrade
37-
args: [--py38-plus]
37+
args: ['--py310-plus']
3838
- repo: https://github.com/pre-commit/mirrors-autopep8
3939
rev: v2.0.1
4040
hooks:
@@ -43,6 +43,8 @@ repos:
4343
rev: 23.1.0
4444
hooks:
4545
- id: black
46+
args:
47+
- --target-version=py310
4648
- repo: https://github.com/pycqa/flake8
4749
rev: 5.0.4
4850
hooks:

piptools_requirements.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.10
3+
# by the following command:
4+
#
5+
# cd ~/src/omnibot && run-piptools
6+
#
7+
8+
pip==19.2
9+
# via -r /code/piptools/bootstrap_ins/requirements.in
10+
setuptools==59.6.0
11+
# via -r /code/piptools/bootstrap_ins/requirements.in

piptools_requirements3.txt

Lines changed: 0 additions & 6 deletions
This file was deleted.

requirements.in

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# piptools: python3.8
1+
# piptools: python3.10
22

33

44
# WSGI HTTP Server for UNIX
@@ -39,17 +39,17 @@ statsd==3.2.1
3939
# Coroutine-based network library
4040
# License: MIT
4141
# Upstream url: http://www.gevent.org/
42-
gevent==21.1.2
42+
gevent==23.7.0
4343

4444
# Lightweight in-process concurrent programming
4545
# License: MIT
4646
# Upstream url: https://github.com/python-greenlet/greenlet
47-
greenlet==1.1.0
47+
greenlet==2.0.2
4848

4949
# YAML parser and emitter for Python
5050
# License: MIT
5151
# Upstream url: http://pyyaml.org/wiki/PyYAML
52-
PyYAML==5.4
52+
PyYAML==6.0.1
5353

5454
# The AWS SDK for Python
5555
# License: Apache2

requirements.txt

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.10
3+
# by the following command:
4+
#
5+
# cd ~/src/omnibot && run-piptools
6+
#
7+
attrs==23.2.0
8+
# via pytest
9+
blinker==1.4
10+
# via -r requirements.in
11+
boto3==1.4.5
12+
# via -r requirements.in
13+
botocore==1.5.95
14+
# via
15+
# boto3
16+
# s3transfer
17+
certifi==2024.2.2
18+
# via requests
19+
charset-normalizer==3.3.2
20+
# via requests
21+
click==7.1.2
22+
# via flask
23+
coverage==7.4.4
24+
# via pytest-cov
25+
docutils==0.20.1
26+
# via botocore
27+
flask==1.1.4
28+
# via
29+
# -r requirements.in
30+
# flask-script
31+
flask-script==2.0.5
32+
# via -r requirements.in
33+
gevent==23.7.0
34+
# via -r requirements.in
35+
greenlet==2.0.2
36+
# via
37+
# -r requirements.in
38+
# gevent
39+
gunicorn==19.10.0
40+
# via -r requirements.in
41+
idna==3.6
42+
# via requests
43+
iniconfig==2.0.0
44+
# via pytest
45+
itsdangerous==1.1.0
46+
# via flask
47+
jinja2==2.11.3.post1
48+
# via flask
49+
jmespath==0.10.0
50+
# via
51+
# boto3
52+
# botocore
53+
markupsafe==2.0.1
54+
# via jinja2
55+
packaging==24.0
56+
# via pytest
57+
pluggy==0.13.1
58+
# via pytest
59+
psutil==5.9.8
60+
# via rainbow-saddle
61+
py==1.11.0
62+
# via pytest
63+
pytest==6.2.4
64+
# via
65+
# -r requirements.in
66+
# pytest-cov
67+
# pytest-mock
68+
pytest-cov==2.11.1
69+
# via -r requirements.in
70+
pytest-mock==3.6.1
71+
# via -r requirements.in
72+
python-dateutil==2.9.0.post0
73+
# via botocore
74+
python-json-logger==0.1.11
75+
# via -r requirements.in
76+
python-redis-lock==3.2.0
77+
# via -r requirements.in
78+
pyyaml==6.0.1
79+
# via -r requirements.in
80+
rainbow-saddle==0.4.0
81+
# via -r requirements.in
82+
redis==2.10.6
83+
# via
84+
# -r requirements.in
85+
# python-redis-lock
86+
requests==2.31.0
87+
# via slackclient
88+
s3transfer==0.1.13
89+
# via boto3
90+
six==1.16.0
91+
# via
92+
# python-dateutil
93+
# slackclient
94+
# websocket-client
95+
slackclient==1.3.1
96+
# via -r requirements.in
97+
statsd==3.2.1
98+
# via -r requirements.in
99+
toml==0.10.2
100+
# via pytest
101+
urllib3==2.2.1
102+
# via requests
103+
websocket-client==0.54.0
104+
# via slackclient
105+
werkzeug==1.0.1
106+
# via flask
107+
zope-event==5.0
108+
# via gevent
109+
zope-interface==6.2
110+
# via gevent
111+
112+
pip==19.2
113+
# via -r piptools_requirements.txt
114+
setuptools==59.6.0
115+
# via
116+
# -r piptools_requirements.txt
117+
# zope-event
118+
# zope-interface

requirements3.txt

Lines changed: 0 additions & 57 deletions
This file was deleted.

tests/integration/routes/test_interactive.py

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import json
22
from typing import Any
3-
from typing import Dict
43
from unittest.mock import MagicMock
54

65
from flask import Response # noqa: F401
@@ -18,7 +17,7 @@ def test_dialog_submission_echo_test(
1817
slack_api_call: MagicMock,
1918
):
2019
with get_mock_data("interactive/dialog_submission_echo_test.json") as json_data:
21-
event: Dict[str, Any] = json.loads(json_data.read())
20+
event: dict[str, Any] = json.loads(json_data.read())
2221
resp: Response = client.post(
2322
_ENDPOINT,
2423
data=event,
@@ -70,8 +69,8 @@ def test_invalid_component_type(
7069
slack_api_call: MagicMock,
7170
):
7271
with get_mock_data("interactive/dialog_submission_echo_test.json") as json_data:
73-
payload: Dict[str, Any] = json.loads(json_data.read())
74-
modified_data: Dict[str, Any] = json.loads(payload["payload"])
72+
payload: dict[str, Any] = json.loads(json_data.read())
73+
modified_data: dict[str, Any] = json.loads(payload["payload"])
7574
modified_data["type"] = "not a valid type"
7675
resp: Response = client.post(
7776
_ENDPOINT,
@@ -90,8 +89,8 @@ def test_invalid_component_type(
9089

9190
def test_missing_token(client: Client, queue: MagicMock, slack_api_call: MagicMock):
9291
with get_mock_data("interactive/dialog_submission_echo_test.json") as json_data:
93-
payload: Dict[str, Any] = json.loads(json_data.read())
94-
modified_data: Dict[str, Any] = json.loads(payload["payload"])
92+
payload: dict[str, Any] = json.loads(json_data.read())
93+
modified_data: dict[str, Any] = json.loads(payload["payload"])
9594
modified_data.pop("token", None)
9695
resp: Response = client.post(
9796
_ENDPOINT,
@@ -107,8 +106,8 @@ def test_missing_token(client: Client, queue: MagicMock, slack_api_call: MagicMo
107106

108107
def test_missing_team(client: Client, queue: MagicMock, slack_api_call: MagicMock):
109108
with get_mock_data("interactive/dialog_submission_echo_test.json") as json_data:
110-
payload: Dict[str, Any] = json.loads(json_data.read())
111-
modified_data: Dict[str, Any] = json.loads(payload["payload"])
109+
payload: dict[str, Any] = json.loads(json_data.read())
110+
modified_data: dict[str, Any] = json.loads(payload["payload"])
112111
modified_data.pop("team", None)
113112
resp: Response = client.post(
114113
_ENDPOINT,
@@ -124,8 +123,8 @@ def test_missing_team(client: Client, queue: MagicMock, slack_api_call: MagicMoc
124123

125124
def test_unsupported_team(client: Client, queue: MagicMock, slack_api_call: MagicMock):
126125
with get_mock_data("interactive/dialog_submission_echo_test.json") as json_data:
127-
payload: Dict[str, Any] = json.loads(json_data.read())
128-
modified_data: Dict[str, Any] = json.loads(payload["payload"])
126+
payload: dict[str, Any] = json.loads(json_data.read())
127+
modified_data: dict[str, Any] = json.loads(payload["payload"])
129128
modified_data["team"]["id"] = "something random"
130129
resp: Response = client.post(
131130
_ENDPOINT,
@@ -141,8 +140,8 @@ def test_unsupported_team(client: Client, queue: MagicMock, slack_api_call: Magi
141140

142141
def test_invalid_token(client: Client, queue: MagicMock, slack_api_call: MagicMock):
143142
with get_mock_data("interactive/dialog_submission_echo_test.json") as json_data:
144-
payload: Dict[str, Any] = json.loads(json_data.read())
145-
modified_data: Dict[str, Any] = json.loads(payload["payload"])
143+
payload: dict[str, Any] = json.loads(json_data.read())
144+
modified_data: dict[str, Any] = json.loads(payload["payload"])
146145
modified_data["token"] = "something random"
147146
resp: Response = client.post(
148147
_ENDPOINT,
@@ -165,8 +164,8 @@ def test_invalid_callback_id(
165164
slack_api_call: MagicMock,
166165
):
167166
with get_mock_data("interactive/dialog_submission_echo_test.json") as json_data:
168-
payload: Dict[str, Any] = json.loads(json_data.read())
169-
modified_data: Dict[str, Any] = json.loads(payload["payload"])
167+
payload: dict[str, Any] = json.loads(json_data.read())
168+
modified_data: dict[str, Any] = json.loads(payload["payload"])
170169
modified_data["callback_id"] = "something random"
171170
resp: Response = client.post(
172171
_ENDPOINT,
@@ -193,7 +192,7 @@ def test_view_submission_synchronous(
193192
with get_mock_data(
194193
"interactive/view_submission_synchronous_test.json",
195194
) as json_data:
196-
event: Dict[str, Any] = json.loads(json_data.read())
195+
event: dict[str, Any] = json.loads(json_data.read())
197196
resp: Response = client.post(
198197
_ENDPOINT,
199198
data=event,

0 commit comments

Comments
 (0)