diff --git a/eng/pipelines/templates/jobs/archetype-sdk-nightly.yml b/eng/pipelines/templates/jobs/archetype-sdk-nightly.yml index f656e0114d94..59b5ca0a9072 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-nightly.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-nightly.yml @@ -39,7 +39,7 @@ jobs: dependsOn: - 'Build' - timeoutInMinutes: 240 + timeoutInMinutes: 270 strategy: matrix: diff --git a/eng/pipelines/templates/steps/build-artifacts.yml b/eng/pipelines/templates/steps/build-artifacts.yml index 1d21d34003d9..26028e320d9e 100644 --- a/eng/pipelines/templates/steps/build-artifacts.yml +++ b/eng/pipelines/templates/steps/build-artifacts.yml @@ -9,6 +9,21 @@ steps: displayName: 'Tag scheduled builds' condition: and(eq(variables['Build.SourceBranchName'],'master'),eq(variables['Build.Reason'],'Schedule')) + - task: UsePythonVersion@0 + displayName: 'Use Python 2.7' + inputs: + versionSpec: '2.7' + + - script: | + pip install wheel setuptools packaging + displayName: 'Prep Py2 Environment' + + - task: PythonScript@0 + displayName: 'Generate Python2 Applicable Namespace Packages' + inputs: + scriptPath: 'scripts/devops_tasks/build_packages.py' + arguments: '-d "$(Build.ArtifactStagingDirectory)" "*-nspkg" --service=${{parameters.ServiceDirectory}}' + - task: UsePythonVersion@0 displayName: 'Use Python $(PythonVersion)' inputs: diff --git a/eng/tox/create_wheel_and_install.py b/eng/tox/create_wheel_and_install.py index 50d4e87cc6de..91636b219eac 100644 --- a/eng/tox/create_wheel_and_install.py +++ b/eng/tox/create_wheel_and_install.py @@ -91,7 +91,7 @@ def cleanup_build_artifacts(build_folder): # it does't exist, so we need to error out else: logging.error( - "{w} not present in the prebuilt wheels directory. Exiting." + "{w} not present in the prebuilt wheels directory. Exiting.".format(w=wheel) ) exit(1) else: diff --git a/scripts/devops_tasks/build_packages.py b/scripts/devops_tasks/build_packages.py index 4b3e8f825e10..dc3a205336e2 100644 --- a/scripts/devops_tasks/build_packages.py +++ b/scripts/devops_tasks/build_packages.py @@ -10,7 +10,6 @@ import argparse import sys -from pathlib import Path import os from common_tasks import process_glob_string, run_check_call diff --git a/scripts/devops_tasks/common_tasks.py b/scripts/devops_tasks/common_tasks.py index bc6c5eefc178..fbe903704fcf 100644 --- a/scripts/devops_tasks/common_tasks.py +++ b/scripts/devops_tasks/common_tasks.py @@ -146,7 +146,7 @@ def process_glob_string(glob_string, target_root_dir): # dedup, in case we have double coverage from the glob strings. Example: "azure-mgmt-keyvault,azure-mgmt-*" collected_directories = list(set(collected_top_level_directories)) - + # if we have individually queued this specific package, it's obvious that we want to build it specifically # in this case, do not honor the omission list if len(collected_directories) == 1: diff --git a/sdk/cognitiveservices/azure-cognitiveservices-vision-face/dev_requirements.txt b/sdk/cognitiveservices/azure-cognitiveservices-vision-face/dev_requirements.txt index f6457a93d5e8..6ccb7f031ddd 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-vision-face/dev_requirements.txt +++ b/sdk/cognitiveservices/azure-cognitiveservices-vision-face/dev_requirements.txt @@ -1 +1 @@ --e ../../../tools/azure-sdk-tools \ No newline at end of file +-e ../../../tools/azure-sdk-tools