Skip to content

Commit db30566

Browse files
committed
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-python into protocol_base
* 'master' of https://github.com/Azure/azure-sdk-for-python: (365 commits) Agrifood/test infra (Azure#18779) [formrecognizer] update samples to train a model where a model_id is needed (Azure#18789) replace response urls too (Azure#18758) [AutoRelease] t2-resource-2021-05-19-78417 (Azure#18807) [pipeline]update autorest version for pipeline (Azure#18782) [AutoRelease] t2-digitaltwins-2021-05-18-25594(wave4) (Azure#18786) [AutoRelease] t2-hybridkubernetes-2021-05-19-49364(wave4) (Azure#18802) Added Async APIs and Samples for attestation SDK (Azure#18735) [AVA] Updating links in package ReadMe (Azure#18800) Sync eng/common directory with azure-sdk-tools for PR 1585 (Azure#18793) Increment version for textanalytics releases (Azure#18797) remove PHI with multiple actions due to known service error (Azure#18794) [textanalyitcs] switch to westus2 region (Azure#18791) Remove implicit dependency on successful completion of verify-links (Azure#18277) Add Testing of Conda Artifacts (Azure#18478) reset continuation token (Azure#18772) pipline prepare (Azure#18755) [AutoRelease] t2-machinelearningcompute-2021-05-14-14426(wave4) (Azure#18750) [AutoRelease] t2-iothubprovisioningservices-2021-05-14-29542(wave4) (Azure#18748) [AutoRelease] t2-agfood-2021-05-17-53436 (Azure#18768) ...
2 parents 622ba08 + 4a8c056 commit db30566

File tree

11,092 files changed

+1621947
-560403
lines changed

Some content is hidden

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

11,092 files changed

+1621947
-560403
lines changed

.github/CODEOWNERS

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
/sdk/applicationinsights/azure-applicationinsights/ @divya-jay @geneh @alongafni
3232
/sdk/loganalytics/azure-loganalytics/ @divya-jay @geneh @alongafni
3333

34+
/sdk/attestation/azure-security-attestation @larryosterman @anilba06 @Azure/azure-sdk-write-attestation
35+
3436
# PRLabel: %Batch
3537
/sdk/batch/ @cRui861 @paterasMSFT @dpwatrous @gingi @zfengms
3638
/sdk/cognitiveservices/azure-cognitiveservices-vision-customvision/ @areddish
@@ -71,6 +73,9 @@
7173
# PRLabel: %HDInsight
7274
/sdk/hdinsight/ @idear1203
7375

76+
# PRLabel: %Models repository
77+
/sdk/modelsrepository/ @cartertinney @digimaun
78+
7479
# PRLabel: %Machine Learning Compute
7580
/sdk/machinelearningcompute/ @shutchings
7681

@@ -130,5 +135,5 @@
130135
# Eng Sys
131136
###########
132137
/eng/ @weshaggard @scbedd @mitchdenny @danieljurek
133-
/**/tests.yml @danieljurek
138+
/**/tests.yml @benbp
134139
/**/ci.yml @mitchdenny

.vscode/cspell.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"version": "0.1",
3+
"language": "en",
4+
"languageId": "python",
5+
"dictionaries": [
6+
"powershell"
7+
],
8+
"ignorePaths": [
9+
"**/tests/recordings/**",
10+
".vscode/cspell.json"
11+
],
12+
"words": ["azsdk", "conda", "tenvparallel"],
13+
"allowCompoundWords": false
14+
}

common/smoketest/smoke-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
jobs:
2-
- template: /eng/pipelines/templates/jobs/smoke-test.yml
2+
- template: /eng/pipelines/templates/jobs/smoke.tests.yml
33
parameters:
44
Daily: true

doc/dev/conda-builds.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
Follow the instructions [here](https://docs.conda.io/projects/conda-build/en/latest/install-conda-build.html) to install `conda` and `conda-build`.
66

7+
**The Azure SDK Conda artifacts support `python3.8` and `python3.9` only.**
8+
79
## CI Build Process
810

911
There will be a `CondaArtifact` defined in the `ci.yml` of each service directory. (`sdk/<service>`)
@@ -15,7 +17,31 @@ A Conda Artifact defines:
1517
- Any other necessary details.
1618

1719
## How to Build an Azure SDK Conda Package Locally
20+
#### If using powershell, you will need to prep your environment before proceeding to the next step
21+
22+
```
23+
powershell -ExecutionPolicy ByPass -NoExit -Command "& '<path-to-conda-folder>\shell\condabin\conda-hook.ps1' ; conda activate '<path-to-conda-folder>' "
24+
```
25+
26+
Afterwards, invoke `conda init powershell` and re-create the pshell session.
27+
28+
By default, your powershell environment will now load `conda`. If you want pure pip, you will need to use explicit invocations of your `python` locations to create virtual envs.
29+
### Set up your conda environment
30+
1831

32+
You will notice that all the azure-sdk conda distributions have the **same** version number and requirement set. This is due to the fact that the azure-sdk team pushes our conda packages out in waves. To support this, all versions are set via a common environment variable `AZURESDK_CONDA_VERSION`.
33+
34+
We keep this environment variable set properly across all our builds by using a common `conda_env.yml` when creating our build environment. This environment definition ensures that:
35+
36+
1. Our channel `https://azuresdkconda.blob.core.windows.net/channel1/` is added to the set to download packages
37+
2. The environment variable `AZURESDK_CONDA_VERSION` will be set exactly once.
38+
39+
40+
Reference the `conda_env.yml` in your local build by pass `-f <path to conda_env.yml>` when you create your conda environment.
41+
42+
```
43+
conda env create --yes --quiet --name ${{ artifact.name }} -f $(Build.SourcesDirectory)/eng/conda_env.yml
44+
```
1945

2046
### Create Your Build Directory
2147
Given how Conda packages are comprised of multiple source distributions _combined_, the buildable source does not exist directly within the azure-sdk-for-python repo. Currently, there is _some_ manual work that needs to be done.
@@ -84,6 +110,8 @@ python `build_conda_artifacts.py`
84110
-r "azure/storage"
85111
-n "azure-storage"
86112
-s "storage"
113+
-e "<resolvable path to repo root>/eng/conda_env.yml"
114+
-c "<resolvable path to sdk/storage/ci.yml>"
87115
```
88116

89117
### Generate the Conda Package

0 commit comments

Comments
 (0)