Skip to content

Commit 9feac04

Browse files
authored
Merge branch 'Azure:main' into mepatil/apiv2.1DNRPython
2 parents 5a780ca + 3c12ca1 commit 9feac04

File tree

58 files changed

+1028
-215
lines changed

Some content is hidden

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

58 files changed

+1028
-215
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@
750750
#/<NotInRepo>/ @sunilagarwal @lfittl-msft @sr-msft @niklarin
751751

752752
# ServiceLabel: %Recovery Services Backup %Service Attention
753-
#/<NotInRepo>/ @pvrk @adityabalaji-msft @Daya-Patil
753+
#/<NotInRepo>/ @Daya-Patil
754754

755755
# ServiceLabel: %Recovery Services Site-Recovery %Service Attention
756756
#/<NotInRepo>/ @Sharmistha-Rai

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ You can find service libraries in the `/sdk` directory.
1616

1717
### Prerequisites
1818

19-
The client libraries are supported on Python 3.7 or later. For more details, please read our page on [Azure SDK for Python version support policy](https://github.com/Azure/azure-sdk-for-python/wiki/Azure-SDKs-Python-version-support-policy).
19+
The client libraries are supported on Python 3.8 or later. For more details, please read our page on [Azure SDK for Python version support policy](https://github.com/Azure/azure-sdk-for-python/wiki/Azure-SDKs-Python-version-support-policy).
2020

2121
## Packages available
2222

doc/eng_sys_checks.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
- [The pyproject.toml](#the-pyprojecttoml)
88
- [Environment variables important to CI](#environment-variables-important-to-ci)
99
- [Atomic Overrides](#atomic-overrides)
10+
- [Enable test logging in CI pipelines](#enable-test-logging-in-ci-pipelines)
1011
- [Analyze Checks](#analyze-checks)
1112
- [MyPy](#mypy)
1213
- [Pyright](#pyright)
@@ -167,6 +168,16 @@ The name that you should use is visible based on what the `tox environment` that
167168
- `AZURE_SERVICEBUS_PYRIGHT=true` <-- enable a check that normally is disabled in `pyproject.toml`
168169
- `AZURE_CORE_PYLINT=false` <-- disable a check that normally runs
169170

171+
### Enable test logging in CI pipelines
172+
173+
You can enable test logging in a pipeline by setting the queue time variable `PYTEST_LOG_LEVEL` to the desired logging [level](https://docs.python.org/3/library/logging.html#logging-levels). For example,
174+
175+
`PYTEST_LOG_LEVEL=INFO`
176+
177+
This also works locally with tox by setting the `PYTEST_LOG_LEVEL` environment variable.
178+
179+
Note that if you want DEBUG level logging with sensitive information unredacted in the test logs, then you still must pass `logging_enable=True` into the client(s) being used in tests.
180+
170181
## Analyze Checks
171182

172183
Analyze job in both nightly CI and pull request validation pipeline runs a set of static analysis using external and internal tools. Following are the list of these static analysis.

eng/common/pipelines/templates/steps/create-tags-and-git-release.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
parameters:
22
ArtifactLocation: 'not-specified'
33
PackageRepository: 'not-specified'
4+
PackageFilter: ''
45
ReleaseSha: 'not-specified'
56
RepoId: $(Build.Repository.Name)
67
WorkingDirectory: ''
@@ -14,10 +15,11 @@ steps:
1415
arguments: >
1516
-artifactLocation ${{ parameters.ArtifactLocation }}
1617
-packageRepository ${{ parameters.PackageRepository }}
18+
-packageFilter "${{ parameters.PackageFilter }}"
1719
-releaseSha ${{ parameters.ReleaseSha }}
1820
-repoId ${{ parameters.RepoId }}
1921
-workingDirectory '${{ parameters.WorkingDirectory }}'
2022
pwsh: true
2123
timeoutInMinutes: 5
2224
env:
23-
GH_TOKEN: $(azuresdk-github-pat)
25+
GH_TOKEN: $(azuresdk-github-pat)

eng/common/scripts/create-tags-and-git-release.ps1

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ param (
77
$artifactLocation, # the root of the artifact folder. DevOps $(System.ArtifactsDirectory)
88
$workingDirectory, # directory that package artifacts will be extracted into for examination (if necessary)
99
$packageRepository, # used to indicate destination against which we will check the existing version.
10+
$packageFilter,
1011
# valid options: PyPI, Nuget, NPM, Maven, C, CPP
1112
# used by CreateTags
1213
$releaseSha, # the SHA for the artifacts. DevOps: $(Release.Artifacts.<artifactAlias>.SourceVersion) or $(Build.SourceVersion)
@@ -26,6 +27,11 @@ Write-Host "Using API URL $apiUrl"
2627
# VERIFY PACKAGES
2728
$pkgList = VerifyPackages -artifactLocation $artifactLocation -workingDirectory $workingDirectory -apiUrl $apiUrl -releaseSha $releaseSha -continueOnError $continueOnError
2829

30+
if ($packageFilter) {
31+
Write-Host "Filtering discovered packages to '$packageFilter'"
32+
[array]$pkgList = $pkgList | Where-Object { $_.PackageId -like $packageFilter }
33+
}
34+
2935
if ($pkgList) {
3036
Write-Host "Given the visible artifacts, github releases will be created for the following:"
3137

eng/emitter-package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"main": "dist/src/index.js",
33
"dependencies": {
4-
"@azure-tools/typespec-python": "0.18.0",
4+
"@azure-tools/typespec-python": "0.18.1",
55
"@azure-tools/typespec-azure-resource-manager": "0.37.0"
66
}
77
}

eng/tox/tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ pkgs =
4848

4949
[pytest]
5050
ignore_args=--ignore=.tox --ignore=build --ignore=.eggs
51-
default_args = -rsfE --junitxml={tox_root}/test-junit-{envname}.xml --verbose --cov-branch --durations=10 --ignore=azure {[pytest]ignore_args}
51+
default_args = -rsfE --junitxml={tox_root}/test-junit-{envname}.xml --verbose --cov-branch --durations=10 --ignore=azure {[pytest]ignore_args} --log-cli-level={pytest_log_level}
5252

5353
[testenv]
5454
parallel_show_output =True

eng/tox/toxfile.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import os
12
from logging import getLogger
23
from pathlib import Path
34

@@ -17,3 +18,8 @@ def tox_add_core_config(core_conf: CoreConfigSet, state: State):
1718
next(p for p in Path(core_conf["config_file_path"]).resolve().parents if (p / ".git").exists()),
1819
)
1920

21+
core_conf.add_constant(
22+
"pytest_log_level",
23+
"The log level to use for pytest, supplied as environment or queue time variable PYTEST_LOG_LEVEL",
24+
os.getenv("PYTEST_LOG_LEVEL", "51") # Defaults to no logging
25+
)

sdk/ai/azure-ai-generative/setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
"azureml-fsspec>=1",
9595
"azureml-mlflow",
9696
"fsspec>=2023.3",
97-
"openai>=0.27.8,<1",
97+
"openai>=0.27.8",
9898
"tiktoken>=0.3,<1",
9999
"mmh3",
100100
"requests",
@@ -114,7 +114,7 @@
114114
"promptflow-vectordb"
115115
],
116116
"qa_generation": [
117-
"openai>=0.27.8,<1"
117+
"openai>=0.27.8"
118118
],
119119
"simulator": [
120120
"aiohttp>=3.8.5",

sdk/communication/azure-communication-callautomation/assets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"AssetsRepo": "Azure/azure-sdk-assets",
33
"AssetsRepoPrefixPath": "python",
44
"TagPrefix": "python/communication/azure-communication-callautomation",
5-
"Tag": "python/communication/azure-communication-callautomation_30d9f8d148"
5+
"Tag": "python/communication/azure-communication-callautomation_3124e163ae"
66
}

0 commit comments

Comments
 (0)