Skip to content

Commit 062009f

Browse files
iscai-msftiscai-msft
committed
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-python into merge_patch
* 'main' of https://github.com/Azure/azure-sdk-for-python: (72 commits) [tool]update llc-quick-start-tool for py3 only (Azure#22507) [mgmt] update setupy for python3.6 (Azure#22505) [pipeline] Upgrade python version to `python3.8` (Azure#22503) [AutoRelease] t2-synapse-2022-01-11-70733 (Azure#22439) Update tests.md (Azure#22500) disable per Azure#22498 (Azure#22499) [AnomalyDetector] Release 3.0.0b4 (Azure#22191) [translation] update docs to include managed identity option (Azure#22366) add back py3.6 (Azure#22478) Add Python 3.6 support back to Storage packages (Azure#22483) allow Python 3.6 with the sdk (Azure#22456) remove hardcoded subscription ID (Azure#22481) clean up tests/docs (Azure#22480) Increment version for eventhub releases (Azure#22485) [Cosmos] Remove support for Python27, set Python36 as minimum, and update cosmos emulator pipeline (Azure#22475) Increment version for servicebus releases (Azure#22484) add back py3.6 (Azure#22477) [AutoRelease] t2-datafactory-2022-01-06-31864 (Azure#22362) [AutoRelease] t2-apimanagement-2022-01-06-51326 (Azure#22361) [AutoRelease] t2-netapp-2022-01-12-75881 (Azure#22467) ...
2 parents 51d7ecf + 2f89813 commit 062009f

File tree

1,869 files changed

+886018
-1028520
lines changed

Some content is hidden

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

1,869 files changed

+886018
-1028520
lines changed

‎.github/CODEOWNERS

+7-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
/sdk/eventhub/ @annatisch @yunhaoling @swathipil @rakshith91
2424

2525
# PRLabel: %Storage
26-
/sdk/storage/ @amishra-dev @zezha-msft @annatisch @tasherif-msft
26+
/sdk/storage/ @amishra-dev @zezha-msft @annatisch @tasherif-msft @jalauzon-msft
2727

2828
# PRLabel: %App Configuration
2929
/sdk/appconfiguration/ @xiangyan99 @YalinLi0312
@@ -42,6 +42,7 @@
4242
/sdk/communication/azure-communication-phonenumbers/ @RoyHerrod @danielav7 @whisper6284 @AlonsoMondal
4343
/sdk/communication/azure-communication-sms/ @RoyHerrod @arifibrahim4
4444
/sdk/communication/azure-communication-identity/ @Azure/acs-identity-sdk
45+
/sdk/communication/**/_shared/ @Azure/acs-identity-sdk
4546

4647
# PRLabel: %KeyVault
4748
/sdk/keyvault/ @schaabs @mccoyp @YalinLi0312
@@ -66,7 +67,7 @@
6667
/sdk/containerservice/ @samkreter @zqingqing1 @GaneshaThirumurthi
6768

6869
# PRLabel: %Cosmos
69-
/sdk/cosmos/ @kushagraThapar @simorenoh @simplynaveen20 @xinlian12 @moderakh
70+
/sdk/cosmos/ @kushagraThapar @simorenoh @simplynaveen20 @xinlian12 @moderakh
7071

7172
# ServiceLabel: %Cosmos %Service Attention
7273
#/<NotInRepo>/ @simorenoh @gahl-levy
@@ -139,6 +140,9 @@
139140
# PRLabel: %VideoAnalyzer
140141
/sdk/videoanalyzer/ @hivyas
141142

143+
# PRLabel: %WebPubSub
144+
/sdk/webpubsub/ @msyyc @iscai-msft
145+
142146
# Smoke Tests
143147
/common/smoketest/ @lmazuel @chlowell @annatisch @rakshith91 @shurd @southpolesteve
144148

@@ -729,7 +733,7 @@
729733

730734

731735
# Management Plane
732-
/**/*mgmt*/ @RAY-316 @msyyc
736+
/**/*mgmt*/ @BigCat20196 @msyyc
733737

734738

735739
###########

‎doc/dev/private_package/python_multiapi_configuration.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ the target tag should only contain files from one folder:
1616

1717
![](one_folder.png)
1818

19-
If your tag contains files from different folders, you need to define some split tags. For example: `ApplicationInsights` has [Tag: package-2021-11-01](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/applicationinsights/resource-manager#tag-package-2021-11-01), but it contains different folders. If you want to publish the package for the tag, you need to split it to different tags: [[applicationinsights\] python multiapi config by RAY-316 · Pull Request #16799 · Azure/azure-rest-api-specs (github.com)](https://github.com/Azure/azure-rest-api-specs/pull/16799/files)
19+
If your tag contains files from different folders, you need to define some split tags. For example: `ApplicationInsights` has [Tag: package-2021-11-01](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/applicationinsights/resource-manager#tag-package-2021-11-01), but it contains different folders. If you want to publish the package for the tag, you need to split it to different tags: [sample](https://github.com/Azure/azure-rest-api-specs/pull/16799/files)
2020

2121
![](different_folders.png)
2222

‎doc/dev/tests.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ If your library has a management plane library, you can build a preparer specifi
162162

163163
1. Create an Azure Resource Management Template for your specific service and the configuration you need. This can be done in the portal by creating the resources and at the very last step (Review + Create) clicking "Download a template for automation". Save this template to a `test-resources.json` file under the directory that contains your library (`sdk/<my-library>/test-resources.json`).
164164
2. Use the [`New-TestResources.ps1`](https://github.com/Azure/azure-sdk-for-python/tree/main/eng/common/TestResources#on-the-desktop) script to deploy those resources.
165-
3. Set the environment variables returned from step 2 in your current shell or add them to your `.env` file at the root of the repo to save these secrets. If you choose the latter method, you will have to make sure all the key-value pairs are in the format `<key_name>=<value>`, rather than the `${env:<key_name>} = '<value>'` formatting used in PowerShell. The names of the environment variables should be in all capital letters, snake case, and be prefixed with the library name. Ie. `TABLES_PRIMARY_KEY`, `FORMRECOGNIZER_ACCOUNT_URL`, `EVENTHUBS_SECRET_KEY`.
165+
3. Set the environment variables returned from step 2 in your current shell or add them to your `.env` file at the root of the repo to save these secrets. If you choose the latter method, you will have to make sure all the key-value pairs are in the format `<key_name>=<value>`, rather than the `${env:<key_name>} = '<value>'` formatting used in PowerShell. The names of the environment variables should be in all capital letters, snake case, and be prefixed with the library name. Ie. `TABLES_PRIMARY_KEY`, `FORMRECOGNIZER_ACCOUNT_URL`, `EVENTHUBS_SECRET_KEY`. If the name of the service is more than one word, like Form Recognizer, don't include an underscore between the words. Use `FORMRECOGNIZER_ACCOUNT_URL`, not `FORM_RECOGNIZER_ACCOUNT_URL`.
166166
4. Create a partial implementation of the PowerShellPreparer to pass in your specific environment variables. An example implementation is shown below for schemaregistry
167167

168168
```python

‎eng/ci_tools.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# requirements leveraged by ci tools
2-
cryptography==3.1
2+
cryptography==3.3.2
33
setuptools==44.1.0; python_version == '2.7'
44
setuptools==46.4.0; python_version >= '3.5'
55
virtualenv==20.0.23
@@ -27,7 +27,7 @@ cffi==1.15.0rc2; python_version >= '3.10'
2727

2828
# locking packages defined as deps from azure-sdk-tools or azure-devtools
2929
pytoml==0.1.21
30-
pyOpenSSL==19.1.0
30+
pyOpenSSL==21.0.0
3131
json-delta==2.0
3232
ConfigArgParse==1.2.3
3333
six==1.14.0

‎eng/common/TestResources/New-TestResources.ps1

+18-8
Original file line numberDiff line numberDiff line change
@@ -143,14 +143,24 @@ function NewServicePrincipalWrapper([string]$subscription, [string]$resourceGrou
143143
$spPassword = $servicePrincipal.Secret
144144
$appId = $servicePrincipal.ApplicationId
145145
} else {
146-
Write-Verbose "Creating password for service principal via MS Graph API"
147-
# Microsoft graph objects (Az version >= 7.0.0) do not provision a secret # on creation so it must be added separately.
148-
# Submitting a password credential object without specifying a password will result in one being generated on the server side.
149-
$password = New-Object -TypeName "Microsoft.Azure.PowerShell.Cmdlets.Resources.MSGraph.Models.ApiV10.MicrosoftGraphPasswordCredential"
150-
$password.DisplayName = "Password for $displayName"
151-
$credential = Retry { New-AzADSpCredential -PasswordCredentials $password -ServicePrincipalObject $servicePrincipal }
152-
$spPassword = ConvertTo-SecureString $credential.SecretText -AsPlainText -Force
153-
$appId = $servicePrincipal.AppId
146+
if ((Get-Module Az.Resources).Version -eq "5.1.0") {
147+
Write-Verbose "Creating password and credential for service principal via MS Graph API"
148+
Write-Warning "Please update Az.Resources to >= 5.2.0 by running 'Update-Module Az'"
149+
# Microsoft graph objects (Az.Resources version == 5.1.0) do not provision a secret on creation so it must be added separately.
150+
# Submitting a password credential object without specifying a password will result in one being generated on the server side.
151+
$password = New-Object -TypeName "Microsoft.Azure.PowerShell.Cmdlets.Resources.MSGraph.Models.ApiV10.MicrosoftGraphPasswordCredential"
152+
$password.DisplayName = "Password for $displayName"
153+
$credential = Retry { New-AzADSpCredential -PasswordCredentials $password -ServicePrincipalObject $servicePrincipal }
154+
$spPassword = ConvertTo-SecureString $credential.SecretText -AsPlainText -Force
155+
$appId = $servicePrincipal.AppId
156+
} else {
157+
Write-Verbose "Creating service principal credential via MS Graph API"
158+
# In 7.1.0 the password credential issue was fixed (see https://github.com/Azure/azure-powershell/pull/16690) but the
159+
# parameter set was changed making the above call fail due to a missing ServicePrincipalId parameter.
160+
$credential = Retry { $servicePrincipal | New-AzADSpCredential }
161+
$spPassword = ConvertTo-SecureString $credential.SecretText -AsPlainText -Force
162+
$appId = $servicePrincipal.AppId
163+
}
154164
}
155165

156166
return @{

‎eng/pipelines/templates/stages/cosmos-sdk-client.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,9 @@ stages:
3333
- job: Emulator
3434
strategy:
3535
matrix:
36-
Windows_Python35:
36+
Windows_Python36:
3737
OSVmImage: 'windows-2019'
38-
PythonVersion: '3.5'
39-
Windows_Python27:
40-
OSVmImage: 'windows-2019'
41-
PythonVersion: '2.7'
38+
PythonVersion: '3.6'
4239
pool:
4340
vmImage: $(OSVmImage)
4441

‎eng/pipelines/templates/stages/platform-matrix-conda-support.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
{
22
"matrix": {
33
"Agent": {
4-
"ubuntu-20.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" },
5-
"windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" }
4+
"ubuntu-20.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" }
65
},
7-
"PythonVersion": [ "3.6", "3.8", "3.9" ]
6+
"PythonVersion": [ "3.6" ]
87
}
98
}

‎eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"Agent": {
77
"ubuntu-20.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" }
88
},
9-
"PythonVersion": [ "pypy3", "3.7", "3.8", "3.9" ],
9+
"PythonVersion": [ "pypy3", "3.6", "3.7", "3.8", "3.9" ],
1010
"CoverageArg": "--disablecov"
1111
},
1212
"include": [

‎eng/pipelines/templates/stages/platform-matrix.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" },
1111
"macOS-10.15": { "OSVmImage": "macOS-10.15", "Pool": "Azure Pipelines" }
1212
},
13-
"PythonVersion": [ "pypy3", "3.7", "3.8" ],
13+
"PythonVersion": [ "pypy3", "3.6", "3.7", "3.8" ],
1414
"CoverageArg": "--disablecov",
1515
"TestSamples": "false"
1616
},

‎eng/pipelines/templates/steps/analyze.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,10 @@ steps:
126126
parameters:
127127
Artifacts: ${{ parameters.Artifacts }}
128128

129-
- template: /eng/common/pipelines/templates/steps/detect-api-changes.yml
130-
parameters:
131-
Artifacts: ${{ parameters.Artifacts }}
129+
# Temporarily disabling due to #22416
130+
# - template: /eng/common/pipelines/templates/steps/detect-api-changes.yml
131+
# parameters:
132+
# Artifacts: ${{ parameters.Artifacts }}
132133

133134
- template: /eng/common/pipelines/templates/steps/eng-common-workflow-enforcer.yml
134135

‎eng/pipelines/templates/steps/build-artifacts.yml

+11
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,17 @@ steps:
101101

102102
- ${{ parameters.BeforePublishSteps }}
103103

104+
- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
105+
displayName: 'Upload Package SBOM'
106+
inputs:
107+
BuildDropPath: $(Build.ArtifactStagingDirectory)
108+
109+
- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
110+
displayName: 'Upload Documentation SBOM'
111+
condition: and(succeeded(), ${{ parameters.BuildDocs }})
112+
inputs:
113+
BuildDropPath: $(Build.SourcesDirectory)/_docs
114+
104115
- template: /eng/common/pipelines/templates/steps/publish-artifact.yml
105116
parameters:
106117
ArtifactPath: '$(Build.ArtifactStagingDirectory)'

‎eng/pipelines/templates/steps/build-conda-artifacts.yml

+5
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,11 @@ steps:
7878
displayName: 'Activate Conda Environment and Build ${{ artifact.name }}'
7979
workingDirectory: $(Build.SourcesDirectory)/sdk/${{ parameters.ServiceDirectory }}/conda-recipe
8080
81+
- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
82+
displayName: 'Upload Conda Package SBOM'
83+
inputs:
84+
BuildDropPath: '$(Agent.BuildDirectory)/conda/output'
85+
8186
- template: /eng/common/pipelines/templates/steps/publish-artifact.yml
8287
parameters:
8388
ArtifactPath: '$(Agent.BuildDirectory)/conda/output'

‎eng/pipelines/templates/variables/globals.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
variables:
22
PythonVersion: '3.9'
33
skipComponentGovernanceDetection: true
4-
AzureSDKCondaChannel: https://azuresdkconda.blob.core.windows.net/channel1/
4+
AzureSDKCondaChannel: https://azuresdkconda.blob.core.windows.net/channel1/
5+
Package.EnableSBOMSigning: true

‎eng/regression_test_tools.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ bandit==1.6.2
1414
# locking packages defined as deps from azure-sdk-tools or azure-devtools
1515
pytoml==0.1.21
1616
readme-renderer[md]==25.0
17-
pyOpenSSL==19.1.0
17+
pyOpenSSL==21.0.0
1818
json-delta==2.0
1919
ConfigArgParse==1.2.3
2020
six==1.14.0

‎eng/regression_tools.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# requirements leveraged by ci tools
2-
cryptography==3.1
2+
cryptography==3.3.2
33
setuptools==44.1.0; python_version == '2.7'
44
setuptools==46.4.0; python_version >= '3.5'
55
virtualenv==20.0.23
@@ -23,7 +23,7 @@ black==21.6b0; python_version >= '3.6'
2323

2424
# locking packages defined as deps from azure-sdk-tools or azure-devtools
2525
pytoml==0.1.21
26-
pyOpenSSL==19.1.0
26+
pyOpenSSL==21.0.0
2727
json-delta==2.0
2828
ConfigArgParse==1.2.3
2929
six==1.14.0

‎eng/test_tools.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ chardet>=2.0,<5.0
2222
# locking packages defined as deps from azure-sdk-tools or azure-devtools
2323
pytoml==0.1.21
2424
readme-renderer[md]==25.0
25-
pyOpenSSL==19.1.0
25+
pyOpenSSL==21.0.0
2626
json-delta==2.0
2727
ConfigArgParse==1.2.3
2828
six==1.14.0

‎eng/tox/tox_helper_tasks.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def parse_req(req):
8282
def get_pip_list_output():
8383
"""Uses the invoking python executable to get the output from pip list."""
8484
out = subprocess.Popen(
85-
[sys.executable, "-m", "pip", "list", "--disable-pip-version-check"],
85+
[sys.executable, "-m", "pip", "list", "--disable-pip-version-check", "--format", "freeze"],
8686
stdout=subprocess.PIPE,
8787
stderr=subprocess.STDOUT,
8888
)
@@ -95,7 +95,7 @@ def get_pip_list_output():
9595
# this should be compatible with py27 https://docs.python.org/2.7/library/stdtypes.html#str.decode
9696
for line in stdout.decode("utf-8").split(os.linesep)[2:]:
9797
if line:
98-
package, version = re.split("\s+", line)
98+
package, version = re.split("==", line)
9999
collected_output[package] = version
100100
else:
101101
raise Exception(stderr)

‎scripts/auto_release/main.py

+20-5
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import argparse
66
import logging
77
from ghapi.all import GhApi
8+
from util import CERTIFICATION
89

910

1011
SERVICE_NAME = 'servicename'
@@ -15,6 +16,7 @@
1516
BRANCH_BASE = ''
1617
OUT_PATH = ''
1718
NEW_BRANCH = ''
19+
USER_REPO = ''
1820

1921
_LOG = logging.getLogger()
2022

@@ -404,9 +406,9 @@ def git_remote_add():
404406
global TRACK, NEW_BRANCH
405407
# init git
406408
print_exec('git checkout . && git clean -fd && git reset --hard HEAD ')
407-
print_exec('git remote add autosdk https://github.com/AzureSDKAutomation/azure-sdk-for-python.git')
408-
print_check(f'git fetch autosdk {BRANCH_BASE}')
409-
print_check(f'git checkout autosdk/{BRANCH_BASE}')
409+
print_exec(f'git remote add {USER_REPO} https://github.com/{USER_REPO}/azure-sdk-for-python.git')
410+
print_check(f'git fetch {USER_REPO} {BRANCH_BASE}')
411+
print_check(f'git checkout {USER_REPO}/{BRANCH_BASE}')
410412

411413

412414
def create_branch():
@@ -418,6 +420,14 @@ def create_branch():
418420
print_exec(f'git checkout -b {NEW_BRANCH}')
419421

420422

423+
def add_certificate():
424+
cacert_path = r'../venv-sdk/lib/python3.8/site-packages/certifi/cacert.pem'
425+
with open(cacert_path, 'a+') as f:
426+
f.seek(0, 0)
427+
f.write(CERTIFICATION)
428+
my_print(f"Added CERTIFICATION into cacert.pem of {cacert_path}")
429+
430+
421431
def commit_file():
422432
print_exec('git add sdk/')
423433
print_exec('git add shared_requirements.txt')
@@ -430,6 +440,7 @@ def main():
430440
git_remote_add()
431441
judge_sdk_folder()
432442
create_branch()
443+
add_certificate()
433444
init_env()
434445
edit_file()
435446
edit_useless_file()
@@ -454,15 +465,19 @@ def main():
454465
logging.basicConfig()
455466
main_logger.setLevel(logging.INFO)
456467

457-
BRANCH_BASE = args.branch.replace('AzureSDKAutomation:', '')
468+
USER_REPO = args.branch.split(':')[0]
469+
BRANCH_BASE = args.branch.split(':')[1]
458470
SCRIPT_PATH = args.script_path
459471
OUT_PATH = args.out_path
460472

461-
# extract info
473+
# extract info. (e.g. AzureSDKAutomation:sdkAuto/track2_azure-mgmt-apimanagement)
462474
sys.path.append(OUT_PATH)
463475
TRACK = '2' if BRANCH_BASE.find('track2_') > -1 else '1'
464476
SERVICE_NAME = BRANCH_BASE.replace('sdkAuto/', '').replace('sdkAutomation/', '').replace('track2_', '').replace(
465477
'azure-mgmt-', '')
478+
# compatible with `azclibot:t2-apimanagement-2022-01-05-26928`
479+
if len(SERVICE_NAME.split('-')) > 1:
480+
SERVICE_NAME = SERVICE_NAME.split('-')[1]
466481
try:
467482
main()
468483
except Exception as e:

‎scripts/auto_release/util.py

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
CERTIFICATION = '''
2+
-----BEGIN CERTIFICATE-----
3+
MIIDSDCCAjCgAwIBAgIUPMKpJ/j10eQrcQBNnkImIaOYHakwDQYJKoZIhvcNAQEL
4+
BQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MB4XDTIxMDgwNTAwMzU1NloXDTIyMDgw
5+
NTAwMzU1NlowFDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEF
6+
AAOCAQ8AMIIBCgKCAQEAxe/ZseXgOTVoF7uTjX5Leknk95jIoyGc+VlxA8BhzGOr
7+
r4u6VNQZRCMq+svHY36tW4+u/xHNe2kvbwy2mnS8cFFLfst+94qBZVJDBxSGZ9I/
8+
wekErNsjFsik4UrMvcC+ZlGPh7hb3f7tSx29tn1DIkAUXVnbZ6TT5s+mYRQpZ6fW
9+
6kR3RNfc0A1IUM7Zs9yfNEr0O2H41P2HcLKoOPtvd7GvTQm9Ofh3srKvII+sZn/J
10+
WH7r76oRQMX904mOMdryQwZLObsqX4dXIEbafKVSecB3PBVIhv8gVtJhcZbQP1pI
11+
mMiWd6PHv46ZhGf7+cKnYUSa8Ia2t/wetK1wd00dFwIDAQABo4GRMIGOMA8GA1Ud
12+
EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGmMBYGA1UdJQEB/wQMMAoGCCsGAQUF
13+
BwMBMBcGA1UdEQEB/wQNMAuCCWxvY2FsaG9zdDA6BgorBgEEAYI3VAEBBCwMKkFT
14+
UC5ORVQgQ29yZSBIVFRQUyBkZXZlbG9wbWVudCBjZXJ0aWZpY2F0ZTANBgkqhkiG
15+
9w0BAQsFAAOCAQEAIj2VlBVcXGSly6KCBg6lgwFi+henWfSox77iuGAaAxDjN3jd
16+
9lZahW4MPNLHKSrPRb4YNSLZ2jh7zdcttQrqd4qH65o1q56q5JrCmli99iIzY9Y8
17+
RdYyxK4Zzr31wjpsyFiWQfqJTuSFUUg9uDDj0negwEZLIGlt7nr12wflt2+QOJtD
18+
byMeSZLbB5dPzn341DK0qfJEJMMgL0XsPEVZ3TQ6Alc9zq5wI608C/mXnz3xJE05
19+
UTYD8pRJJ/DyG0empvOVE8Sg93msHPquAbgqO9aqCpykgg/a8CFvI4wRdfvGEFlv
20+
8XJKL8Y/PFsmFeO3axq3zUYKFVdc9Un4dFIaag==
21+
-----END CERTIFICATE-----
22+
'''

‎scripts/automation_init.sh

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
#!/bin/bash
22

3+
# install python3.8
4+
sudo apt-get install python3.8
5+
sudo apt-get install python3.8-venv
6+
7+
# init env
38
rm -rf $TMPDIR/venv-sdk
4-
python3 -m venv $TMPDIR/venv-sdk
9+
python3.8 -m venv $TMPDIR/venv-sdk
510
VIRTUAL_ENV=$TMPDIR/venv-sdk
611
export VIRTUAL_ENV
712
PATH="$VIRTUAL_ENV/bin:$PATH"

‎scripts/quickstart_tooling_llc/llc_initial.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ def build_package(**kwargs) -> None:
7777

7878
# generate code with autorest and swagger readme
7979
_LOGGER.info("generate SDK code with autorest")
80-
check_call(f'autorest --version=latest --python --use=@autorest/python@latest --python-mode=update {swagger_readme}', shell=True)
80+
check_call(f'autorest --version=3.7.2 --python --use=@autorest/[email protected] --use=@autorest/[email protected]'
81+
f' --python-mode=update {swagger_readme}', shell=True)
8182

8283
# generate necessary file(setup.py, CHANGELOG.md, etc)
8384
work_path = Path(output_folder)

‎scripts/quickstart_tooling_llc/template/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ python -m pip install {{ package_name }}
1616

1717
#### Prequisites
1818

19-
- Python 2.7, or 3.6 or later is required to use this package.
19+
- Python 3.6 or later is required to use this package.
2020
- You need an [Azure subscription][azure_sub] to use this package.
2121
- An existing {{ package_pprint_name }} instance.
2222

‎scripts/quickstart_tooling_llc/template/dev_requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
-e ../../../tools/azure-sdk-tools
33
../../core/azure-core
44
../../identity/azure-identity
5-
../../nspkg/{{ folder_first }}-{{ folder_second }}-nspkg
65
aiohttp>=3.0;
76
typing_extensions>=3.7.2
87
asyncio;

0 commit comments

Comments
 (0)