Pre Python 3.12 enablement fixes (#2529)

Author: xrmx

instrumentation/opentelemetry-instrumentation-botocore/test-requirements.txt

@@ -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

instrumentation/opentelemetry-instrumentation-botocore/tests/test_botocore_dynamodb.py

@@ -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
@@ -390,7 +390,7 @@ def test_query(self):
                 }
             },
             ScanIndexForward=True,
-            ProjectionExpression="1,2",
+            ProjectionExpression="PE",
             ReturnConsumedCapacity="TOTAL",
         )
 
@@ -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)
 
@@ -419,7 +419,7 @@ def test_scan(self):
             Select="ALL_ATTRIBUTES",
             TotalSegments=17,
             Segment=21,
-            ProjectionExpression="1,2",
+            ProjectionExpression="PE",
             ConsistentRead=True,
             ReturnConsumedCapacity="TOTAL",
         )
@@ -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)
 

instrumentation/opentelemetry-instrumentation-pika/tests/test_utils.py

@@ -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()

tox.ini

@@ -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]