Skip to content

Commit

Permalink
fix conflict and merge main
Browse files Browse the repository at this point in the history
  • Loading branch information
zedy committed Sep 26, 2024
2 parents ad51108 + f0c6e8b commit 4b0e647
Show file tree
Hide file tree
Showing 6,888 changed files with 937,404 additions and 288,539 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
13 changes: 13 additions & 0 deletions .config/1espt/PipelineAutobaseliningConfig.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
## DO NOT MODIFY THIS FILE MANUALLY. This is part of auto-baselining from 1ES Pipeline Templates. Go to [https://aka.ms/1espt-autobaselining] for more details.

pipelines:
'*':
mainPipelineId: 983
retail:
source:
credscan:
lastModifiedDate: 2024-09-13
psscriptanalyzer:
lastModifiedDate: 2024-09-13
armory:
lastModifiedDate: 2024-09-13
27 changes: 21 additions & 6 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
# SDK
###########

/.github/CODEOWNERS @lmazuel @xiangyan99 @kristapratico @Azure/azure-sdk-eng

# Catch all
/sdk/ @lmazuel

Expand Down Expand Up @@ -50,6 +48,12 @@
# PRLabel: %AI
/sdk/ai/ @luigiw @needuv @achauhan-scc @kingernupur @paulshealy1 @singankit

# ServiceOwners: @luigiw @needuv @singankit
# ServiceLabel: %Evaluation

# PRLabel: %Evaluation
/sdk/evaluation/ @Azure/azure-sdk-write-evaluation

# ServiceLabel: %AgriFood
# PRLabel: %AgriFood
/sdk/agrifood/azure-agrifood-farming/ @bhargav-kansagara
Expand Down Expand Up @@ -118,7 +122,7 @@

# ServiceLabel: %Communication - Phone Numbers
# PRLabel: %Communication - Phone Numbers
/sdk/communication/azure-communication-phonenumbers/ @miguhern @whisper6284 @RoyHerrod @danielav7
/sdk/communication/azure-communication-phonenumbers/ @miguhern @whisper6284 @danielav7

# ServiceLabel: %Communication - Rooms
# PRLabel: %Communication - Rooms
Expand Down Expand Up @@ -265,7 +269,7 @@
# ServiceOwners: @azureml-github @Azure/azure-ml-sdk

# PRLabel: %Machine Learning
/sdk/ml/ @paulshealy1 @achauhan-scc @kingernupur
/sdk/ml/ @paulshealy1 @achauhan-scc @kingernupur

# PRLabel: %ML-Local Endpoints
/sdk/ml/azure-ai-ml/azure/ai/ml/_local_endpoints/ @NonStatic2014 @arunsu @JustinFirsching
Expand Down Expand Up @@ -323,6 +327,10 @@
# PRLabel: %OpenAI
/sdk/openai/ @kristapratico @glecaros

# ServiceLabel: %Operator Nexus - Network Cloud
# PRLabel: %Operator Nexus - Network Cloud
/sdk/networkcloud/ @Azure/azure-sdk-write-networkcloud

# ServiceLabel: %Purview
# PRLabel: %Purview
/sdk/purview/ @yifan-zhou922
Expand Down Expand Up @@ -378,7 +386,7 @@

# ServiceLabel: %Health Deidentification
# PRLabel: %Health Deidentification
/sdk/healthdataaiservices/ @GrahamMThomas @danielszaniszlo
/sdk/healthdataaiservices/ @GrahamMThomas

# AzureSdkOwners: @YalinLi0312
# ServiceLabel: %Cognitive - Form Recognizer
Expand Down Expand Up @@ -834,12 +842,19 @@
/eng/ @scbedd @weshaggard @benbp
/eng/common/ @Azure/azure-sdk-eng
/.github/workflows/ @Azure/azure-sdk-eng
/.github/CODEOWNERS @lmazuel @xiangyan99 @kristapratico @Azure/azure-sdk-eng

/.config/1espt/ @benbp @weshaggard

/tools/ @scbedd @mccoyp

# Add owners for notifications for specific pipelines
/eng/pipelines/templates/jobs/tests-nightly-python.yml @lmazuel @mccoyp
/eng/pipelines/aggregate-reports.yml @lmazuel @mccoyp @YalinLi0312
/eng/pipelines/aggregate-reports.yml @lmazuel @mccoyp @YalinLi0312 @kristapratico
/eng/common/pipelines/codeowners-linter.yml @lmazuel @mccoyp

# Add approvers for typespec-python emitter version updates
/eng/emitter-package.json @mccoyp @catalinaperalta @kristapratico @iscai-msft
/eng/emitter-package-lock.json @mccoyp @catalinaperalta @kristapratico @iscai-msft

/pylintrc @l0lawrence
4 changes: 2 additions & 2 deletions .github/workflows/event-processor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
run: >
dotnet tool install
Azure.Sdk.Tools.GitHubEventProcessor
--version 1.0.0-dev.20240708.1
--version 1.0.0-dev.20240917.2
--add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json
--global
shell: bash
Expand Down Expand Up @@ -114,7 +114,7 @@ jobs:
run: >
dotnet tool install
Azure.Sdk.Tools.GitHubEventProcessor
--version 1.0.0-dev.20240708.1
--version 1.0.0-dev.20240917.2
--add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json
--global
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scheduled-event-processor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
run: >
dotnet tool install
Azure.Sdk.Tools.GitHubEventProcessor
--version 1.0.0-dev.20240708.1
--version 1.0.0-dev.20240917.2
--add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json
--global
shell: bash
Expand Down
30 changes: 29 additions & 1 deletion .vscode/cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
"sdk/core/azure-servicemanagement-legacy/**",
"sdk/core/corehttp/**",
"sdk/digitaltwins/azure-digitaltwins-core/**",
"sdk/evaluation/azure-ai-evaluation/tests/**",
"sdk/eventhub/azure-eventhub-checkpointstoretable/**",
"sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/**",
"sdk/eventhub/azure-eventhub/**",
Expand Down Expand Up @@ -137,6 +138,7 @@
"conda/conda-releaselogs/azure-mgmt.md"
],
"words": [
"msedge",
"spinup",
"cibuildwheel",
"aoai",
Expand Down Expand Up @@ -260,6 +262,7 @@
"iohttp",
"IOHTTP",
"IOLRO",
"incompat",
"inprogress",
"ipconfiguration",
"ipconfigurations",
Expand Down Expand Up @@ -1305,7 +1308,32 @@
"mros",
"Nify",
"ctxt",
"wday"
"wday",
"dtype"
]
},
{
"filename": "sdk/evaluation/azure-ai-evaluation/**",
"words": [
"raisvc",
"otel",
"otlp",
"aggr",
"mlflow",
"azureml",
"dcid",
"prompty",
"wsid",
"tkey",
"tparam",
"tqdm",
"ncols",
"datas",
"punkt",
"gleu",
"fmeasure",
"upia",
"xpia",
]
},
{
Expand Down
70 changes: 70 additions & 0 deletions conda/conda-recipes/azure-messaging-webpubsubclient/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
{% set name = "azure-messaging-webpubsubclient" %}

package:
name: "{{ name|lower }}"
version: {{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}

source:
url: {{ environ.get('WEBPUBSUB_SOURCE_DISTRIBUTION', '') }}

build:
noarch: python
number: 0
script: "{{ PYTHON }} -m pip install . -vv"

requirements:
host:
- cryptography
- azure-core >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
- azure-identity >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
- msrest >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
- pip
- pyjwt
- python
- six
- typing_extensions
- requests-oauthlib >=0.5.0
- aiohttp
- isodate
- websocket-client >=1.6.0
run:
- cryptography
- pyjwt
- python
- six
- azure-core >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
- azure-identity >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
- msrest >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
- typing_extensions
- requests-oauthlib >=0.5.0
- aiohttp
- isodate
- websocket-client >=1.6.0

test:
imports:
- azure.messaging.webpubsubclient
- azure.messaging.webpubsubclient.aio

about:
home: "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/webpubsub/azure-messaging-webpubsubclient"
license: MIT
license_family: MIT
license_file:
summary: "Microsoft Azure WebPubSub Client Library for Python"
description: |
Azure Web PubSub is a cloud service that helps developers easily build real-time features in web applications with publish-subscribe patterns at scale.
Any scenario that requires real-time messaging between server and clients or among clients following publish-subscribe patterns can benefit from using Web PubSub. Developers no longer need to poll the server by sending repeated HTTP requests at intervals, which is wasteful and hard-to-scale.
As shown in the diagram below, your clients establish WebSocket connections with your Web PubSub resource. This client library:
- simplifies managing client connections
- simplifies sending messages among clients
- automatically retries after unintended drops of client connection
- reliably deliveries messages in number and in order after recovering from connection drops
Please see https://aka.ms/azsdk/conda/releases/webpubsubclient for version details.
doc_url:
dev_url:

extra:
recipe-maintainers:
- xiangyan99
18 changes: 18 additions & 0 deletions conda/conda-recipes/azure-mgmt/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ test:
- azure.mgmt.apimanagement.aio.operations
- azure.mgmt.apimanagement.models
- azure.mgmt.apimanagement.operations
- azure.mgmt.appcomplianceautomation
- azure.mgmt.appcomplianceautomation.aio
- azure.mgmt.appcomplianceautomation.models
- azure.mgmt.appconfiguration
- azure.mgmt.appconfiguration.aio
- azure.mgmt.appconfiguration.models
Expand Down Expand Up @@ -641,6 +644,11 @@ test:
- azure.mgmt.operationsmanagement.aio.operations
- azure.mgmt.operationsmanagement.models
- azure.mgmt.operationsmanagement.operations
- azure.mgmt.oracledatabase
- azure.mgmt.oracledatabase.aio
- azure.mgmt.oracledatabase.aio.operations
- azure.mgmt.oracledatabase.models
- azure.mgmt.oracledatabase.operations
- azure.mgmt.orbital
- azure.mgmt.orbital.aio
- azure.mgmt.orbital.aio.operations
Expand Down Expand Up @@ -834,6 +842,11 @@ test:
- azure.mgmt.resourceconnector.aio.operations
- azure.mgmt.resourceconnector.models
- azure.mgmt.resourceconnector.operations
- azure.mgmt.scvmm
- azure.mgmt.scvmm.aio
- azure.mgmt.scvmm.aio.operations
- azure.mgmt.scvmm.models
- azure.mgmt.scvmm.operations
- azure.mgmt.search
- azure.mgmt.search.aio
- azure.mgmt.search.aio.operations
Expand Down Expand Up @@ -862,6 +875,11 @@ test:
- azure.mgmt.servicefabric.aio.operations
- azure.mgmt.servicefabric.models
- azure.mgmt.servicefabric.operations
- azure.mgmt.servicefabricmanagedclusters
- azure.mgmt.servicefabricmanagedclusters.aio
- azure.mgmt.servicefabricmanagedclusters.aio.operations
- azure.mgmt.servicefabricmanagedclusters.models
- azure.mgmt.servicefabricmanagedclusters.operations
- azure.mgmt.servicebus
- azure.mgmt.servicebus.aio
- azure.mgmt.servicebus.models
Expand Down
2 changes: 1 addition & 1 deletion conda/conda-recipes/conda_env.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
variables:
AZURESDK_CONDA_VERSION: '2024.06.01'
AZURESDK_CONDA_VERSION: '2024.09.01'
4 changes: 2 additions & 2 deletions conda/conda-recipes/msal-extensions/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ build:

requirements:
host:
- msal >=2023.06.01
- msal >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
- pip
- portalocker
- python
run:
- msal >=2023.06.01
- msal >={{ environ.get('AZURESDK_CONDA_VERSION', '0.0.0') }}
- portalocker
- pyjwt
- python
Expand Down
6 changes: 6 additions & 0 deletions conda/conda-releaselogs/azure-ai-contentsafety.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
Azure AI Content Safety client library for Python (conda)

## 2024.09.01

### Packages included

- azure-ai-contentsafety-1.0.0

## 2024.06.01

### Packages included
Expand Down
6 changes: 6 additions & 0 deletions conda/conda-releaselogs/azure-ai-formrecognizer.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Azure Form Recognizer client library for Python (conda)

## 2024.09.01

### Packages included

- azure-ai-formrecognizer-3.3.3

## 2024.06.01

### Packages included
Expand Down
6 changes: 6 additions & 0 deletions conda/conda-releaselogs/azure-ai-language-conversations.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Azure Conversational Language Understanding client library for Python (conda)

## 2024.09.01

### Packages included

- azure-ai-language-conversations-1.1.0

## 2024.06.01

### Packages included
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Azure Cognitive Language Services Question Answering client library for Python (conda)

## 2024.09.01

### Packages included

- azure-ai-language-questionanswering-1.1.0

## 2024.06.01

### Packages included
Expand Down
6 changes: 6 additions & 0 deletions conda/conda-releaselogs/azure-ai-metricsadvisor.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Azure Metrics Advisor client library for Python (conda)

## 2024.09.01

### Packages included

- azure-ai-metricsadvisor-1.0.0

## 2024.06.01

### Packages included
Expand Down
6 changes: 6 additions & 0 deletions conda/conda-releaselogs/azure-ai-ml.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Azure ML Package client library for Python (conda)

## 2024.09.01

### Packages included

- azure-ai-ml-1.19.0

## 2024.06.01

### Packages included
Expand Down
6 changes: 6 additions & 0 deletions conda/conda-releaselogs/azure-ai-textanalytics.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Azure Text Analytics client library for Python (conda)

## 2024.09.01

### Packages included

- azure-ai-textanalytics-5.3.0

## 2024.06.01

### Packages included
Expand Down
Loading

0 comments on commit 4b0e647

Please sign in to comment.