Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…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)
  ...
  • Loading branch information
iscai-msft committed Jan 14, 2022
2 parents 51d7ecf + 2f89813 commit 062009f
Show file tree
Hide file tree
Showing 1,869 changed files with 886,018 additions and 1,028,520 deletions.
10 changes: 7 additions & 3 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
/sdk/eventhub/ @annatisch @yunhaoling @swathipil @rakshith91

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

# PRLabel: %App Configuration
/sdk/appconfiguration/ @xiangyan99 @YalinLi0312
Expand All @@ -42,6 +42,7 @@
/sdk/communication/azure-communication-phonenumbers/ @RoyHerrod @danielav7 @whisper6284 @AlonsoMondal
/sdk/communication/azure-communication-sms/ @RoyHerrod @arifibrahim4
/sdk/communication/azure-communication-identity/ @Azure/acs-identity-sdk
/sdk/communication/**/_shared/ @Azure/acs-identity-sdk

# PRLabel: %KeyVault
/sdk/keyvault/ @schaabs @mccoyp @YalinLi0312
Expand All @@ -66,7 +67,7 @@
/sdk/containerservice/ @samkreter @zqingqing1 @GaneshaThirumurthi

# PRLabel: %Cosmos
/sdk/cosmos/ @kushagraThapar @simorenoh @simplynaveen20 @xinlian12 @moderakh
/sdk/cosmos/ @kushagraThapar @simorenoh @simplynaveen20 @xinlian12 @moderakh

# ServiceLabel: %Cosmos %Service Attention
#/<NotInRepo>/ @simorenoh @gahl-levy
Expand Down Expand Up @@ -139,6 +140,9 @@
# PRLabel: %VideoAnalyzer
/sdk/videoanalyzer/ @hivyas

# PRLabel: %WebPubSub
/sdk/webpubsub/ @msyyc @iscai-msft

# Smoke Tests
/common/smoketest/ @lmazuel @chlowell @annatisch @rakshith91 @shurd @southpolesteve

Expand Down Expand Up @@ -729,7 +733,7 @@


# Management Plane
/**/*mgmt*/ @RAY-316 @msyyc
/**/*mgmt*/ @BigCat20196 @msyyc


###########
Expand Down
2 changes: 1 addition & 1 deletion doc/dev/private_package/python_multiapi_configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ the target tag should only contain files from one folder:

![](one_folder.png)

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)
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)

![](different_folders.png)

Expand Down
2 changes: 1 addition & 1 deletion doc/dev/tests.md
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ If your library has a management plane library, you can build a preparer specifi

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`).
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.
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`.
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`.
4. Create a partial implementation of the PowerShellPreparer to pass in your specific environment variables. An example implementation is shown below for schemaregistry

```python
Expand Down
4 changes: 2 additions & 2 deletions eng/ci_tools.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# requirements leveraged by ci tools
cryptography==3.1
cryptography==3.3.2
setuptools==44.1.0; python_version == '2.7'
setuptools==46.4.0; python_version >= '3.5'
virtualenv==20.0.23
Expand Down Expand Up @@ -27,7 +27,7 @@ cffi==1.15.0rc2; python_version >= '3.10'

# locking packages defined as deps from azure-sdk-tools or azure-devtools
pytoml==0.1.21
pyOpenSSL==19.1.0
pyOpenSSL==21.0.0
json-delta==2.0
ConfigArgParse==1.2.3
six==1.14.0
Expand Down
26 changes: 18 additions & 8 deletions eng/common/TestResources/New-TestResources.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -143,14 +143,24 @@ function NewServicePrincipalWrapper([string]$subscription, [string]$resourceGrou
$spPassword = $servicePrincipal.Secret
$appId = $servicePrincipal.ApplicationId
} else {
Write-Verbose "Creating password for service principal via MS Graph API"
# Microsoft graph objects (Az version >= 7.0.0) do not provision a secret # on creation so it must be added separately.
# Submitting a password credential object without specifying a password will result in one being generated on the server side.
$password = New-Object -TypeName "Microsoft.Azure.PowerShell.Cmdlets.Resources.MSGraph.Models.ApiV10.MicrosoftGraphPasswordCredential"
$password.DisplayName = "Password for $displayName"
$credential = Retry { New-AzADSpCredential -PasswordCredentials $password -ServicePrincipalObject $servicePrincipal }
$spPassword = ConvertTo-SecureString $credential.SecretText -AsPlainText -Force
$appId = $servicePrincipal.AppId
if ((Get-Module Az.Resources).Version -eq "5.1.0") {
Write-Verbose "Creating password and credential for service principal via MS Graph API"
Write-Warning "Please update Az.Resources to >= 5.2.0 by running 'Update-Module Az'"
# Microsoft graph objects (Az.Resources version == 5.1.0) do not provision a secret on creation so it must be added separately.
# Submitting a password credential object without specifying a password will result in one being generated on the server side.
$password = New-Object -TypeName "Microsoft.Azure.PowerShell.Cmdlets.Resources.MSGraph.Models.ApiV10.MicrosoftGraphPasswordCredential"
$password.DisplayName = "Password for $displayName"
$credential = Retry { New-AzADSpCredential -PasswordCredentials $password -ServicePrincipalObject $servicePrincipal }
$spPassword = ConvertTo-SecureString $credential.SecretText -AsPlainText -Force
$appId = $servicePrincipal.AppId
} else {
Write-Verbose "Creating service principal credential via MS Graph API"
# In 7.1.0 the password credential issue was fixed (see https://github.com/Azure/azure-powershell/pull/16690) but the
# parameter set was changed making the above call fail due to a missing ServicePrincipalId parameter.
$credential = Retry { $servicePrincipal | New-AzADSpCredential }
$spPassword = ConvertTo-SecureString $credential.SecretText -AsPlainText -Force
$appId = $servicePrincipal.AppId
}
}

return @{
Expand Down
7 changes: 2 additions & 5 deletions eng/pipelines/templates/stages/cosmos-sdk-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,9 @@ stages:
- job: Emulator
strategy:
matrix:
Windows_Python35:
Windows_Python36:
OSVmImage: 'windows-2019'
PythonVersion: '3.5'
Windows_Python27:
OSVmImage: 'windows-2019'
PythonVersion: '2.7'
PythonVersion: '3.6'
pool:
vmImage: $(OSVmImage)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"matrix": {
"Agent": {
"ubuntu-20.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" },
"windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" }
"ubuntu-20.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" }
},
"PythonVersion": [ "3.6", "3.8", "3.9" ]
"PythonVersion": [ "3.6" ]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"Agent": {
"ubuntu-20.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" }
},
"PythonVersion": [ "pypy3", "3.7", "3.8", "3.9" ],
"PythonVersion": [ "pypy3", "3.6", "3.7", "3.8", "3.9" ],
"CoverageArg": "--disablecov"
},
"include": [
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/templates/stages/platform-matrix.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" },
"macOS-10.15": { "OSVmImage": "macOS-10.15", "Pool": "Azure Pipelines" }
},
"PythonVersion": [ "pypy3", "3.7", "3.8" ],
"PythonVersion": [ "pypy3", "3.6", "3.7", "3.8" ],
"CoverageArg": "--disablecov",
"TestSamples": "false"
},
Expand Down
7 changes: 4 additions & 3 deletions eng/pipelines/templates/steps/analyze.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,10 @@ steps:
parameters:
Artifacts: ${{ parameters.Artifacts }}

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

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

Expand Down
11 changes: 11 additions & 0 deletions eng/pipelines/templates/steps/build-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,17 @@ steps:

- ${{ parameters.BeforePublishSteps }}

- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
displayName: 'Upload Package SBOM'
inputs:
BuildDropPath: $(Build.ArtifactStagingDirectory)

- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
displayName: 'Upload Documentation SBOM'
condition: and(succeeded(), ${{ parameters.BuildDocs }})
inputs:
BuildDropPath: $(Build.SourcesDirectory)/_docs

- template: /eng/common/pipelines/templates/steps/publish-artifact.yml
parameters:
ArtifactPath: '$(Build.ArtifactStagingDirectory)'
Expand Down
5 changes: 5 additions & 0 deletions eng/pipelines/templates/steps/build-conda-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@ steps:
displayName: 'Activate Conda Environment and Build ${{ artifact.name }}'
workingDirectory: $(Build.SourcesDirectory)/sdk/${{ parameters.ServiceDirectory }}/conda-recipe
- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
displayName: 'Upload Conda Package SBOM'
inputs:
BuildDropPath: '$(Agent.BuildDirectory)/conda/output'

- template: /eng/common/pipelines/templates/steps/publish-artifact.yml
parameters:
ArtifactPath: '$(Agent.BuildDirectory)/conda/output'
Expand Down
3 changes: 2 additions & 1 deletion eng/pipelines/templates/variables/globals.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
variables:
PythonVersion: '3.9'
skipComponentGovernanceDetection: true
AzureSDKCondaChannel: https://azuresdkconda.blob.core.windows.net/channel1/
AzureSDKCondaChannel: https://azuresdkconda.blob.core.windows.net/channel1/
Package.EnableSBOMSigning: true
2 changes: 1 addition & 1 deletion eng/regression_test_tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ bandit==1.6.2
# locking packages defined as deps from azure-sdk-tools or azure-devtools
pytoml==0.1.21
readme-renderer[md]==25.0
pyOpenSSL==19.1.0
pyOpenSSL==21.0.0
json-delta==2.0
ConfigArgParse==1.2.3
six==1.14.0
Expand Down
4 changes: 2 additions & 2 deletions eng/regression_tools.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# requirements leveraged by ci tools
cryptography==3.1
cryptography==3.3.2
setuptools==44.1.0; python_version == '2.7'
setuptools==46.4.0; python_version >= '3.5'
virtualenv==20.0.23
Expand All @@ -23,7 +23,7 @@ black==21.6b0; python_version >= '3.6'

# locking packages defined as deps from azure-sdk-tools or azure-devtools
pytoml==0.1.21
pyOpenSSL==19.1.0
pyOpenSSL==21.0.0
json-delta==2.0
ConfigArgParse==1.2.3
six==1.14.0
Expand Down
2 changes: 1 addition & 1 deletion eng/test_tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ chardet>=2.0,<5.0
# locking packages defined as deps from azure-sdk-tools or azure-devtools
pytoml==0.1.21
readme-renderer[md]==25.0
pyOpenSSL==19.1.0
pyOpenSSL==21.0.0
json-delta==2.0
ConfigArgParse==1.2.3
six==1.14.0
Expand Down
4 changes: 2 additions & 2 deletions eng/tox/tox_helper_tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def parse_req(req):
def get_pip_list_output():
"""Uses the invoking python executable to get the output from pip list."""
out = subprocess.Popen(
[sys.executable, "-m", "pip", "list", "--disable-pip-version-check"],
[sys.executable, "-m", "pip", "list", "--disable-pip-version-check", "--format", "freeze"],
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
)
Expand All @@ -95,7 +95,7 @@ def get_pip_list_output():
# this should be compatible with py27 https://docs.python.org/2.7/library/stdtypes.html#str.decode
for line in stdout.decode("utf-8").split(os.linesep)[2:]:
if line:
package, version = re.split("\s+", line)
package, version = re.split("==", line)
collected_output[package] = version
else:
raise Exception(stderr)
Expand Down
25 changes: 20 additions & 5 deletions scripts/auto_release/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import argparse
import logging
from ghapi.all import GhApi
from util import CERTIFICATION


SERVICE_NAME = 'servicename'
Expand All @@ -15,6 +16,7 @@
BRANCH_BASE = ''
OUT_PATH = ''
NEW_BRANCH = ''
USER_REPO = ''

_LOG = logging.getLogger()

Expand Down Expand Up @@ -404,9 +406,9 @@ def git_remote_add():
global TRACK, NEW_BRANCH
# init git
print_exec('git checkout . && git clean -fd && git reset --hard HEAD ')
print_exec('git remote add autosdk https://github.com/AzureSDKAutomation/azure-sdk-for-python.git')
print_check(f'git fetch autosdk {BRANCH_BASE}')
print_check(f'git checkout autosdk/{BRANCH_BASE}')
print_exec(f'git remote add {USER_REPO} https://github.com/{USER_REPO}/azure-sdk-for-python.git')
print_check(f'git fetch {USER_REPO} {BRANCH_BASE}')
print_check(f'git checkout {USER_REPO}/{BRANCH_BASE}')


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


def add_certificate():
cacert_path = r'../venv-sdk/lib/python3.8/site-packages/certifi/cacert.pem'
with open(cacert_path, 'a+') as f:
f.seek(0, 0)
f.write(CERTIFICATION)
my_print(f"Added CERTIFICATION into cacert.pem of {cacert_path}")


def commit_file():
print_exec('git add sdk/')
print_exec('git add shared_requirements.txt')
Expand All @@ -430,6 +440,7 @@ def main():
git_remote_add()
judge_sdk_folder()
create_branch()
add_certificate()
init_env()
edit_file()
edit_useless_file()
Expand All @@ -454,15 +465,19 @@ def main():
logging.basicConfig()
main_logger.setLevel(logging.INFO)

BRANCH_BASE = args.branch.replace('AzureSDKAutomation:', '')
USER_REPO = args.branch.split(':')[0]
BRANCH_BASE = args.branch.split(':')[1]
SCRIPT_PATH = args.script_path
OUT_PATH = args.out_path

# extract info
# extract info. (e.g. AzureSDKAutomation:sdkAuto/track2_azure-mgmt-apimanagement)
sys.path.append(OUT_PATH)
TRACK = '2' if BRANCH_BASE.find('track2_') > -1 else '1'
SERVICE_NAME = BRANCH_BASE.replace('sdkAuto/', '').replace('sdkAutomation/', '').replace('track2_', '').replace(
'azure-mgmt-', '')
# compatible with `azclibot:t2-apimanagement-2022-01-05-26928`
if len(SERVICE_NAME.split('-')) > 1:
SERVICE_NAME = SERVICE_NAME.split('-')[1]
try:
main()
except Exception as e:
Expand Down
22 changes: 22 additions & 0 deletions scripts/auto_release/util.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
CERTIFICATION = '''
-----BEGIN CERTIFICATE-----
MIIDSDCCAjCgAwIBAgIUPMKpJ/j10eQrcQBNnkImIaOYHakwDQYJKoZIhvcNAQEL
BQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MB4XDTIxMDgwNTAwMzU1NloXDTIyMDgw
NTAwMzU1NlowFDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEF
AAOCAQ8AMIIBCgKCAQEAxe/ZseXgOTVoF7uTjX5Leknk95jIoyGc+VlxA8BhzGOr
r4u6VNQZRCMq+svHY36tW4+u/xHNe2kvbwy2mnS8cFFLfst+94qBZVJDBxSGZ9I/
wekErNsjFsik4UrMvcC+ZlGPh7hb3f7tSx29tn1DIkAUXVnbZ6TT5s+mYRQpZ6fW
6kR3RNfc0A1IUM7Zs9yfNEr0O2H41P2HcLKoOPtvd7GvTQm9Ofh3srKvII+sZn/J
WH7r76oRQMX904mOMdryQwZLObsqX4dXIEbafKVSecB3PBVIhv8gVtJhcZbQP1pI
mMiWd6PHv46ZhGf7+cKnYUSa8Ia2t/wetK1wd00dFwIDAQABo4GRMIGOMA8GA1Ud
EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGmMBYGA1UdJQEB/wQMMAoGCCsGAQUF
BwMBMBcGA1UdEQEB/wQNMAuCCWxvY2FsaG9zdDA6BgorBgEEAYI3VAEBBCwMKkFT
UC5ORVQgQ29yZSBIVFRQUyBkZXZlbG9wbWVudCBjZXJ0aWZpY2F0ZTANBgkqhkiG
9w0BAQsFAAOCAQEAIj2VlBVcXGSly6KCBg6lgwFi+henWfSox77iuGAaAxDjN3jd
9lZahW4MPNLHKSrPRb4YNSLZ2jh7zdcttQrqd4qH65o1q56q5JrCmli99iIzY9Y8
RdYyxK4Zzr31wjpsyFiWQfqJTuSFUUg9uDDj0negwEZLIGlt7nr12wflt2+QOJtD
byMeSZLbB5dPzn341DK0qfJEJMMgL0XsPEVZ3TQ6Alc9zq5wI608C/mXnz3xJE05
UTYD8pRJJ/DyG0empvOVE8Sg93msHPquAbgqO9aqCpykgg/a8CFvI4wRdfvGEFlv
8XJKL8Y/PFsmFeO3axq3zUYKFVdc9Un4dFIaag==
-----END CERTIFICATE-----
'''
7 changes: 6 additions & 1 deletion scripts/automation_init.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
#!/bin/bash

# install python3.8
sudo apt-get install python3.8
sudo apt-get install python3.8-venv

# init env
rm -rf $TMPDIR/venv-sdk
python3 -m venv $TMPDIR/venv-sdk
python3.8 -m venv $TMPDIR/venv-sdk
VIRTUAL_ENV=$TMPDIR/venv-sdk
export VIRTUAL_ENV
PATH="$VIRTUAL_ENV/bin:$PATH"
Expand Down
3 changes: 2 additions & 1 deletion scripts/quickstart_tooling_llc/llc_initial.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ def build_package(**kwargs) -> None:

# generate code with autorest and swagger readme
_LOGGER.info("generate SDK code with autorest")
check_call(f'autorest --version=latest --python --use=@autorest/python@latest --python-mode=update {swagger_readme}', shell=True)
check_call(f'autorest --version=3.7.2 --python --use=@autorest/python@5.12.0 --use=@autorest/modelerfour@4.19.2'
f' --python-mode=update {swagger_readme}', shell=True)

# generate necessary file(setup.py, CHANGELOG.md, etc)
work_path = Path(output_folder)
Expand Down
2 changes: 1 addition & 1 deletion scripts/quickstart_tooling_llc/template/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ python -m pip install {{ package_name }}

#### Prequisites

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
-e ../../../tools/azure-sdk-tools
../../core/azure-core
../../identity/azure-identity
../../nspkg/{{ folder_first }}-{{ folder_second }}-nspkg
aiohttp>=3.0;
typing_extensions>=3.7.2
asyncio;
Loading

0 comments on commit 062009f

Please sign in to comment.