Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…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)
  ...
  • Loading branch information
iscai-msft committed May 19, 2021
2 parents 622ba08 + 4a8c056 commit db30566
Show file tree
Hide file tree
Showing 11,092 changed files with 1,621,947 additions and 560,403 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
7 changes: 6 additions & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
/sdk/applicationinsights/azure-applicationinsights/ @divya-jay @geneh @alongafni
/sdk/loganalytics/azure-loganalytics/ @divya-jay @geneh @alongafni

/sdk/attestation/azure-security-attestation @larryosterman @anilba06 @Azure/azure-sdk-write-attestation

# PRLabel: %Batch
/sdk/batch/ @cRui861 @paterasMSFT @dpwatrous @gingi @zfengms
/sdk/cognitiveservices/azure-cognitiveservices-vision-customvision/ @areddish
Expand Down Expand Up @@ -71,6 +73,9 @@
# PRLabel: %HDInsight
/sdk/hdinsight/ @idear1203

# PRLabel: %Models repository
/sdk/modelsrepository/ @cartertinney @digimaun

# PRLabel: %Machine Learning Compute
/sdk/machinelearningcompute/ @shutchings

Expand Down Expand Up @@ -130,5 +135,5 @@
# Eng Sys
###########
/eng/ @weshaggard @scbedd @mitchdenny @danieljurek
/**/tests.yml @danieljurek
/**/tests.yml @benbp
/**/ci.yml @mitchdenny
14 changes: 14 additions & 0 deletions .vscode/cspell.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"version": "0.1",
"language": "en",
"languageId": "python",
"dictionaries": [
"powershell"
],
"ignorePaths": [
"**/tests/recordings/**",
".vscode/cspell.json"
],
"words": ["azsdk", "conda", "tenvparallel"],
"allowCompoundWords": false
}
2 changes: 1 addition & 1 deletion common/smoketest/smoke-test.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
jobs:
- template: /eng/pipelines/templates/jobs/smoke-test.yml
- template: /eng/pipelines/templates/jobs/smoke.tests.yml
parameters:
Daily: true
28 changes: 28 additions & 0 deletions doc/dev/conda-builds.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

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

**The Azure SDK Conda artifacts support `python3.8` and `python3.9` only.**

## CI Build Process

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

## How to Build an Azure SDK Conda Package Locally
#### If using powershell, you will need to prep your environment before proceeding to the next step

```
powershell -ExecutionPolicy ByPass -NoExit -Command "& '<path-to-conda-folder>\shell\condabin\conda-hook.ps1' ; conda activate '<path-to-conda-folder>' "
```

Afterwards, invoke `conda init powershell` and re-create the pshell session.

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.
### Set up your conda environment


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`.

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:

1. Our channel `https://azuresdkconda.blob.core.windows.net/channel1/` is added to the set to download packages
2. The environment variable `AZURESDK_CONDA_VERSION` will be set exactly once.


Reference the `conda_env.yml` in your local build by pass `-f <path to conda_env.yml>` when you create your conda environment.

```
conda env create --yes --quiet --name ${{ artifact.name }} -f $(Build.SourcesDirectory)/eng/conda_env.yml
```

### Create Your Build Directory
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.
Expand Down Expand Up @@ -84,6 +110,8 @@ python `build_conda_artifacts.py`
-r "azure/storage"
-n "azure-storage"
-s "storage"
-e "<resolvable path to repo root>/eng/conda_env.yml"
-c "<resolvable path to sdk/storage/ci.yml>"
```

### Generate the Conda Package
Expand Down
Loading

0 comments on commit db30566

Please sign in to comment.