Skip to content

Commit 4f0e380

Browse files
committed
Merge branch 'main' into redact-app-insights
2 parents 925e2e1 + 0beae51 commit 4f0e380

File tree

98 files changed

+53518
-252
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+53518
-252
lines changed

.github/CODEOWNERS

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,10 @@
320320
# PRLabel: %Operator Nexus - Network Cloud
321321
/sdk/networkcloud/ @Azure/azure-sdk-write-networkcloud
322322

323+
# ServiceLabel: %Planetary Computer
324+
# PRLabel: %Planetary Computer
325+
/sdk/planetarycomputer/ @mandarinamdar @chahibi
326+
323327
# AzureSdkOwners: @annatisch
324328
# ServiceLabel: %Azure Projects
325329
# ServiceOwners: @annatisch
@@ -859,4 +863,4 @@
859863
/eng/emitter-package-lock.json @mccoyp @catalinaperalta @iscai-msft
860864

861865
/pylintrc @l0lawrence @scbedd @mccoyp
862-
/sdk/**/ci.yml @msyyc @lmazuel
866+
/sdk/**/ci.yml @msyyc @lmazuel @scbedd

eng/ci_tools.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@ pkginfo==1.12.1.2
1111
pip==24.0
1212
typing-extensions==4.12.2
1313
pyproject-api==1.8.0
14-
cibuildwheel==2.16.5
14+
cibuildwheel==2.23.3
1515
importlib-metadata==8.5.0
1616
build==1.2.2.post1
17-
nh3<0.3; platform_python_implementation == "PyPy" and python_version == "3.9"
1817

1918
# requirements leveraged for testing
2019
pytest==8.3.5

eng/swagger_to_sdk_config_v4.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"python": "",
88
"python-mode": "update",
99
"sdkrel:python-sdks-folder": "./sdk/.",
10-
"multiapi": "",
1110
"keep-version-file" :"",
1211
"no-async": ""
1312
},

eng/test_tools.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ bandit==1.6.2
99
stevedore==5.4.1
1010
pyproject-api==1.8.0
1111
build==1.2.2.post1
12-
nh3<0.3; platform_python_implementation == "PyPy" and python_version == "3.9"
1312

1413
# locking packages defined as deps from azure-sdk-tools
1514
Jinja2==3.1.6

eng/tools/azure-sdk-tools/changelog_generics.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,7 @@ In summary, some modules were incorrectly visible/importable and have been renam
4141

4242
Last but not least, HTTP connection pooling is now enabled by default. You should always use a client as a context manager, or call close(), or use no more than one client per process.
4343

44-
# Autorest v3 to v4, if the package is multiapi
45-
46-
47-
## General Breaking changes
44+
# Breaking changes in generated packages
4845

4946
This version uses a next-generation code generator that *might* introduce breaking changes if you were importing from the v20xx_yy_zz API folders.
5047
In summary, some modules were incorrectly visible/importable and have been renamed. This fixed several issues caused by usage of classes that were not supposed to be used in the first place.

eng/tools/azure-sdk-tools/packaging_tools/package_utils.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,12 @@ def change_log_generate(
7777
*,
7878
last_stable_release: Optional[str] = None,
7979
prefolder: Optional[str] = None,
80-
is_multiapi: bool = False,
8180
):
8281
if not last_version:
8382
return "### Other Changes\n\n - Initial version"
8483

8584
# try new changelog tool
86-
if prefolder and not is_multiapi:
85+
if prefolder:
8786
try:
8887
tox_cache_path = Path(prefolder, package_name, ".tox")
8988
if tox_cache_path.exists():

eng/tools/azure-sdk-tools/packaging_tools/templates/multiapi_combiner/client.py.jinja2

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

eng/tools/azure-sdk-tools/packaging_tools/templates/multiapi_combiner/enums.py.jinja2

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

eng/tools/azure-sdk-tools/packaging_tools/templates/multiapi_combiner/models.py.jinja2

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

eng/tools/azure-sdk-tools/packaging_tools/templates/multiapi_combiner/models_init.py.jinja2

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

0 commit comments

Comments
 (0)