Merge branch 'main' into shem/fix_add_depends_on_bug

Author: shemogumbe

.github/dependabot.yml

@@ -5,6 +5,17 @@ updates:
     schedule:
       interval: daily
     open-pull-requests-limit: 10
+    groups:
+      open-telemetry:
+        patterns:
+          - "*opentelemetry*"
+      kiota:
+        patterns:
+          - "*kiota*"
+      pylint:
+        patterns:
+          - "*pylint*"
+          - "*astroid*"
   - package-ecosystem: github-actions
     directory: "/"
     schedule:

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-	".": "1.1.5"
+	".": "1.1.6"
 }

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.1.6](https://github.com/microsoftgraph/msgraph-sdk-python-core/compare/v1.1.5...v1.1.6) (2024-10-18)
+
+
+### Bug Fixes
+
+* removes the tests directory from the package ([3d919a7](https://github.com/microsoftgraph/msgraph-sdk-python-core/commit/3d919a7f88c82bcebcbe093d9606906b56e0b416))
+* removes the tests directory from the package ([ccbed8d](https://github.com/microsoftgraph/msgraph-sdk-python-core/commit/ccbed8df3a9d9165b81f2f8af80282eeb2814907))
+
 ## [1.1.5](https://github.com/microsoftgraph/msgraph-sdk-python-core/compare/v1.1.4...v1.1.5) (2024-10-02)
 
 

MANIFEST.in

@@ -0,0 +1 @@
+exclude tests/*

pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 name = "msgraph-core"
 # The SDK version
 # x-release-please-start-version
-version = "1.1.5"
+version = "1.1.6"
 # x-release-please-end
 authors = [{name = "Microsoft", email = "[email protected]"}]
 description = "Core component of the Microsoft Graph Python SDK"

requirements-dev.txt

@@ -26,7 +26,7 @@ colorama==0.4.6 ; os_name == 'nt'
 
 coverage[toml]==7.6.1 ; python_version >= '3.7'
 
-cryptography==43.0.0 ; python_version >= '3.7'
+cryptography==43.0.1 ; python_version >= '3.7'
 
 dill==0.3.6 ; python_version < '3.11'
 

src/msgraph_core/_constants.py

@@ -10,6 +10,6 @@
 DEFAULT_CONNECTION_TIMEOUT = 30
 # The SDK version
 # x-release-please-start-version
-SDK_VERSION = '1.1.5'
+SDK_VERSION = '1.1.6'
 # x-release-please-end
 MS_DEFAULT_SCOPE = 'https://graph.microsoft.com/.default'

src/msgraph_core/requests/batch_request_item.py

@@ -1,4 +1,5 @@
 import re
+import enum
 import json
 from uuid import uuid4
 from typing import List, Optional, Dict, Union, Any
@@ -39,7 +40,10 @@ def __init__(
         if request_information is None or not request_information.http_method:
             raise ValueError("HTTP method cannot be Null/Empty")
         self._id = id or str(uuid4())
-        self.method = request_information.http_method
+        if isinstance(request_information.http_method, enum.Enum):
+            self._method = request_information.http_method.name
+        else:
+            self._method = request_information.http_method
         self._headers = request_information.request_headers
         self._body = request_information.content
         self.url = request_information.url.replace('/users/me-token-to-replace', '/me', 1)
@@ -183,7 +187,9 @@ def method(self, value: str) -> None:
         Sets the HTTP method of the request item.
         Args:
             value (str): The HTTP method of the request item.
+
         """
+
         self._method = value
 
     @property

tests/requests/test_batch_request_item.py

@@ -2,6 +2,7 @@
 from unittest.mock import Mock
 from urllib.request import Request
 from kiota_abstractions.request_information import RequestInformation
+from kiota_abstractions.method import Method
 from kiota_abstractions.headers_collection import HeadersCollection as RequestHeaders
 from msgraph_core.requests.batch_request_item import BatchRequestItem, StreamInterface
 from kiota_abstractions.serialization import SerializationWriter
@@ -109,6 +110,17 @@ def test_method_property(batch_request_item):
     assert batch_request_item.method == "POST"
 
 
+def test_batch_request_item_method_enum():
+    # Create a RequestInformation instance with an enum value for http_method
+    request_info = RequestInformation()
+    request_info.http_method = Method.GET
+    request_info.url = "https://graph.microsoft.com/v1.0/me"
+    request_info.headers = RequestHeaders()
+    request_info.content = None
+    batch_request_item = BatchRequestItem(request_information=request_info)
+    assert batch_request_item.method == "GET"
+
+
 def test_depends_on_property(batch_request_item):
     batch_request_item.set_depends_on(["request1", "request2"])
     assert batch_request_item.depends_on == ["request1", "request2"]