Skip to content

Commit cb5a51d

Browse files
authored
Merge branch 'main' into update-label-needs-author-feedback-to-current-label-in-use
2 parents 0621003 + 41ed13c commit cb5a51d

File tree

8 files changed

+41
-24
lines changed

8 files changed

+41
-24
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
@microsoftgraph/msgraph-devx-python-write
1+
* @microsoftgraph/msgraph-devx-python-write

.github/policies/msgraph-sdk-python-core.yml renamed to .github/policies/msgraph-sdk-python-core-branch-protection.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# Copyright (c) Microsoft Corporation.
22
# Licensed under the MIT License.
33

4-
# File initially created using https://github.com/MIchaelMainer/policyservicetoolkit/blob/main/branch_protection_export.ps1.
5-
64
name: msgraph-sdk-python-core-branch-protection
75
description: Branch protection policy for the msgraph-sdk-python-core repository
86
resource: repository
@@ -37,6 +35,7 @@ configuration:
3735
# existing status check, the status check will be stuck on pending for status since nothing exists to push an actual status
3836
requiredStatusChecks:
3937
- CodeQL
38+
- check-build-matrix
4039
# Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
4140
requiresStrictStatusChecks: true
4241
# Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
@@ -72,6 +71,7 @@ configuration:
7271
# existing status check, the status check will be stuck on pending for status since nothing exists to push an actual status
7372
requiredStatusChecks:
7473
- CodeQL
74+
- check-build-matrix
7575
# Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
7676
requiresStrictStatusChecks: true
7777
# Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.

.github/workflows/auto-merge-dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
steps:
1818
- name: Dependabot metadata
1919
id: metadata
20-
uses: dependabot/fetch-metadata@v1.6.0
20+
uses: dependabot/fetch-metadata@v2.1.0
2121
with:
2222
github-token: "${{ secrets.GITHUB_TOKEN }}"
2323

.github/workflows/build.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,17 @@ jobs:
4848
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
4949
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
5050
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
51+
52+
# The check-build-matrix returns success if all matrix jobs in build are successful; otherwise, it returns a failure.
53+
# Use this as a PR status check for GitHub Policy Service instead of individual matrix entry checks.
54+
check-build-matrix:
55+
runs-on: ubuntu-latest
56+
needs: build
57+
if: always()
58+
steps:
59+
- name: All build matrix options are successful
60+
if: ${{ !(contains(needs.*.result, 'failure')) }}
61+
run: exit 0
62+
- name: One or more build matrix options failed
63+
if: ${{ contains(needs.*.result, 'failure') }}
64+
run: exit 1

.github/workflows/project-auto-add.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@ on:
99
types:
1010
- opened
1111
branches:
12-
- 'main'
12+
- "main"
1313

1414
jobs:
1515
track_issue:
16-
if: github.actor != 'dependabot[bot]'
16+
if: github.actor != 'dependabot[bot]' && github.event.pull_request.head.repo.fork == false
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Generate token
2020
id: generate_token
21-
uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a
21+
uses: actions/create-github-app-token@v1
2222
with:
23-
app_id: ${{ secrets.GRAPHBOT_APP_ID }}
24-
private_key: ${{ secrets.GRAPHBOT_APP_PEM }}
23+
app-id: ${{ secrets.GRAPHBOT_APP_ID }}
24+
private-key: ${{ secrets.GRAPHBOT_APP_PEM }}
2525

2626
- name: Get project data
2727
env:

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Build package
3333
run: python -m build
3434
- name: Publish package
35-
uses: pypa/gh-action-pypi-publish@81e9d935c883d0b210363ab89cf05f3894778450
35+
uses: pypa/gh-action-pypi-publish@ec4db0b4ddc65acdf4bff5fa45ac92d78b56bdf0
3636
with:
3737
user: __token__
3838
password: ${{ secrets.PYPI_TOKEN }}

requirements-dev.txt

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ asyncmock==0.4.2
66

77
attrs==23.2.0 ; python_version >= '3.7'
88

9-
azure-core==1.30.1 ; python_version >= '3.7'
9+
azure-core==1.30.2 ; python_version >= '3.7'
1010

11-
azure-identity==1.16.0
11+
azure-identity==1.17.0
1212

1313
build==1.2.1
1414

@@ -26,15 +26,15 @@ colorama==0.4.6 ; os_name == 'nt'
2626

2727
coverage[toml]==7.5.3 ; python_version >= '3.7'
2828

29-
cryptography==42.0.7 ; python_version >= '3.7'
29+
cryptography==42.0.8 ; python_version >= '3.7'
3030

3131
dill==0.3.6 ; python_version < '3.11'
3232

3333
exceptiongroup==1.1.1 ; python_version < '3.11'
3434

3535
idna==3.7 ; python_version >= '3.5'
3636

37-
importlib-metadata==6.8.0 ; python_version >= '3.7'
37+
importlib-metadata==7.1.0 ; python_version >= '3.7'
3838

3939
iniconfig==2.0.0 ; python_version >= '3.7'
4040

@@ -50,7 +50,7 @@ mccabe==0.7.0 ; python_version >= '3.6'
5050

5151
mock==5.1.0 ; python_version >= '3.6'
5252

53-
msal==1.28.0
53+
msal==1.28.1
5454

5555
msal-extensions==1.1.0
5656

@@ -60,7 +60,7 @@ mypy-extensions==1.0.0 ; python_version >= '3.5'
6060

6161
outcome==1.3.0.post0 ; python_version >= '3.7'
6262

63-
packaging==24.0 ; python_version >= '3.7'
63+
packaging==24.1 ; python_version >= '3.7'
6464

6565
pathlib2==2.3.7.post1
6666

@@ -74,13 +74,13 @@ pycparser==2.22
7474

7575
pyjwt[crypto]==2.8.0 ; python_version >= '3.7'
7676

77-
pylint==3.2.2
77+
pylint==3.2.3
7878

7979
pyproject-hooks==1.1.0 ; python_version >= '3.7'
8080

81-
pytest==8.2.1
81+
pytest==8.2.2
8282

83-
pytest-cov==4.1.0
83+
pytest-cov==5.0.0
8484

8585
pytest-mock==3.14.0
8686

@@ -92,7 +92,7 @@ pywin32==306 ; platform_system == 'Windows'
9292

9393
requests==2.32.3 ; python_version >= '3.7'
9494

95-
setuptools==69.5.1
95+
setuptools==70.0.0
9696

9797
six==1.16.0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
9898

@@ -111,15 +111,15 @@ trio==0.25.1
111111
types-python-dateutil==2.9.0.20240316
112112

113113
types-requests==2.32.0.20240602; python_version >= '3.7'
114-
urllib3==2.2.1 ; python_version >= '3.7'
115-
typing-extensions==4.12.1 ; python_version >= '3.7'
114+
urllib3==2.2.2 ; python_version >= '3.7'
115+
typing-extensions==4.12.2 ; python_version >= '3.7'
116116

117117

118118
wrapt==1.15.0 ; python_version < '3.11'
119119

120120
yapf==0.40.2
121121

122-
zipp==3.19.1 ; python_version >= '3.7'
122+
zipp==3.19.2 ; python_version >= '3.7'
123123

124124
aiohttp==3.9.5 ; python_version >= '3.6'
125125

src/msgraph_core/tasks/page_iterator.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@ def __init__(
6767
parsable_factory = type(response)
6868
elif constructor_callable is None:
6969
parsable_factory = PageResult
70+
else:
71+
raise ValueError(
72+
'One of the constructor_callable or the PageResult type parameter is required.'
73+
)
7074
self.parsable_factory = parsable_factory
7175
self.pause_index = 0
7276
self.headers: HeadersCollection = HeadersCollection()
@@ -141,7 +145,6 @@ async def next(self) -> Optional[PageResult]:
141145
if self.current_page is not None and not self.current_page.odata_next_link:
142146
return None
143147
response = await self.fetch_next_page()
144-
print(f"Response - {type(response)}")
145148
page: PageResult = PageResult(response.odata_next_link, response.value) # type: ignore
146149
return page
147150

0 commit comments

Comments
 (0)