Skip to content

Pre Python 3.12 enablement fixes #2529

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

Merged
merged 6 commits into from
May 24, 2024
Merged

Pre Python 3.12 enablement fixes #2529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c628aa0
pika: fix typo in assert
xrmx May 17, 2024
c2e30e7
botocore: bump moto to 3.1.19
xrmx May 17, 2024
dd3e23c
tox: fix typo in lint source dir expansion
xrmx May 17, 2024
d06249c
Merge branch 'main' into pre-312-fixes
lzchen May 23, 2024
764703e
Merge branch 'main' into pre-312-fixes
lzchen May 23, 2024
2226b6d
Merge branch 'main' into pre-312-fixes
lzchen May 24, 2024
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 instrumentation/opentelemetry-instrumentation-botocore/test-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jsonschema==4.21.1
jsonschema-specifications==2023.12.1
junit-xml==1.9
MarkupSafe==2.0.1
moto==2.2.20
moto==3.1.19
mpmath==1.3.0
networkx==3.1
packaging==23.2
Expand Down
12 changes: 6 additions & 6 deletions instrumentation/opentelemetry-instrumentation-botocore/tests/test_botocore_dynamodb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,14 +324,14 @@ def test_get_item(self):
Key={"id": {"S": "1"}},
ConsistentRead=True,
AttributesToGet=["id"],
ProjectionExpression="1,2",
ProjectionExpression="PE",
ReturnConsumedCapacity="TOTAL",
)

span = self.assert_span("GetItem")
self.assert_table_names(span, self.default_table_name)
self.assert_consistent_read(span, True)
self.assert_projection(span, "1,2")
self.assert_projection(span, "PE")
self.assert_consumed_capacity(span, self.default_table_name)

@mock_dynamodb2
Expand Down Expand Up @@ -390,7 +390,7 @@ def test_query(self):
}
},
ScanIndexForward=True,
ProjectionExpression="1,2",
ProjectionExpression="PE",
ReturnConsumedCapacity="TOTAL",
)

Expand All @@ -403,7 +403,7 @@ def test_query(self):
self.assert_consistent_read(span, True)
self.assert_index_name(span, "lsi")
self.assert_limit(span, 42)
self.assert_projection(span, "1,2")
self.assert_projection(span, "PE")
self.assert_select(span, "ALL_ATTRIBUTES")
self.assert_consumed_capacity(span, self.default_table_name)

Expand All @@ -419,7 +419,7 @@ def test_scan(self):
Select="ALL_ATTRIBUTES",
TotalSegments=17,
Segment=21,
ProjectionExpression="1,2",
ProjectionExpression="PE",
ConsistentRead=True,
ReturnConsumedCapacity="TOTAL",
)
Expand All @@ -440,7 +440,7 @@ def test_scan(self):
self.assert_consistent_read(span, True)
self.assert_index_name(span, "lsi")
self.assert_limit(span, 42)
self.assert_projection(span, "1,2")
self.assert_projection(span, "PE")
self.assert_select(span, "ALL_ATTRIBUTES")
self.assert_consumed_capacity(span, self.default_table_name)

Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-pika/tests/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ def test_decorate_deque_proxy(
self.assertEqual(res, evt)
generator_info.pending_events.popleft.assert_called_once()
extract.assert_not_called()
context_get_current.not_called()
context_get_current.assert_not_called()
context_detach.assert_called_once()
context_attach.assert_not_called()
get_span.assert_not_called()
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1198,8 +1198,8 @@ deps =
-r dev-requirements.txt

commands =
black --config {toxinidir}/pyproject.toml {{toxinidir}} --diff --check
isort --settings-path {toxinidir}/.isort.cfg {{toxinidir}} --diff --check-only
black --config {toxinidir}/pyproject.toml {toxinidir} --diff --check
isort --settings-path {toxinidir}/.isort.cfg {toxinidir} --diff --check-only
flake8 --config {toxinidir}/.flake8 {toxinidir}

[testenv:spellcheck]
Expand Down