Skip to content

Remove tox from various scripts #45756

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
JennyPng wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −65
Draft

Remove tox from various scripts #45756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/pipelines/templates/jobs/ci.tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ jobs:
AdditionalTestArgs: '--wheel_dir="$(Build.ArtifactStagingDirectory)"'
CoverageArg: $(CoverageArg)
PythonVersion: $(PythonVersion)
ToxTestEnv: $(toxenv)
CheckEnv: $(checks)
ToxEnvParallel: ${{ parameters.ToxEnvParallel }}
InjectedPackages: $(InjectedPackages)
TestProxy: ${{ parameters.TestProxy }}
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/templates/jobs/live.tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ parameters:
default: false
- name: OSName
type: string
- name: ToxTestEnv
- name: CheckEnv
type: string
default: 'whl'
- name: UseFederatedAuth
Expand Down Expand Up @@ -158,7 +158,7 @@ jobs:
${{ insert }}: ${{ parameters.EnvVars }}
PythonVersion: $(PythonVersion)
OSVmImage: $(OSVmImage)
ToxTestEnv: ${{ parameters.ToxTestEnv }}
CheckEnv: ${{ parameters.CheckEnv }}
AdditionalTestArgs: ${{ parameters.AdditionalTestArgs }}
TestMarkArgument: ${{ parameters.TestMarkArgument }}
InjectedPackages: ${{ parameters.InjectedPackages }}
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/templates/stages/archetype-sdk-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ parameters:
- name: TestProxy
type: boolean
default: false
- name: ToxTestEnv
- name: CheckEnv
type: string
default: 'whl'
- name: Packages
Expand Down Expand Up @@ -137,7 +137,7 @@ extends:
BuildDocs: ${{ parameters.BuildDocs }}
TestTimeoutInMinutes: ${{ parameters.TestTimeoutInMinutes }}
TestProxy: ${{ parameters.TestProxy }}
ToxTestEnv: ${{ parameters.ToxTestEnv }}
CheckEnv: ${{ parameters.CheckEnv }}
UseFederatedAuth: ${{ parameters.UseFederatedAuth }}
PersistOidcToken: ${{ parameters.PersistOidcToken }}
MatrixConfigs:
Expand Down
6 changes: 3 additions & 3 deletions eng/pipelines/templates/steps/build-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ parameters:
BeforeTestSteps: []
AfterTestSteps: []
CoverageArg: ''
ToxTestEnv: ""
CheckEnv: ""
RunCoverage: ne(variables['CoverageArg'], '--disablecov')
ToxEnvParallel: ''
InjectedPackages: ''
Expand Down Expand Up @@ -87,7 +87,7 @@ steps:
${{ parameters.CoverageArg }}
--mark_arg="$markArg"
--service="${{ parameters.ServiceDirectory }}"
--checks="${{ parameters.ToxTestEnv }}"
--checks="${{ parameters.CheckEnv }}"
--injected-packages="${{ parameters.InjectedPackages }}";
Write-Host "Last exit code: $LASTEXITCODE";
exit $LASTEXITCODE;
Expand All @@ -109,7 +109,7 @@ steps:
${{ parameters.CoverageArg }} `
--mark_arg="$markArg" `
--service="${{ parameters.ServiceDirectory }}" `
--checks="${{ parameters.ToxTestEnv }}" `
--checks="${{ parameters.CheckEnv }}" `
--injected-packages="${{ parameters.InjectedPackages }}";
exit $LASTEXITCODE;
env: ${{ parameters.EnvVars }}
Expand Down
51 changes: 0 additions & 51 deletions eng/scripts/invoke-tox-parallel.ps1
View file
Open in desktop

This file was deleted.

12 changes: 6 additions & 6 deletions eng/scripts/set_checks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,20 @@ def resolve_devops_variable(var_value: str) -> List[str]:
if var_value.startswith("$("):
return []
else:
return [tox_env.strip() for tox_env in var_value.split(",") if tox_env.strip()]
return [check.strip() for check in var_value.split(",") if check.strip()]
else:
return []


def set_devops_value(resolved_set: List[str]) -> None:
string_value = ",".join(resolved_set)
set_ci_variable("toxenv", string_value)
set_ci_variable("checks", string_value)


def remove_unsupported_values(selected_set: List[str], unsupported_values: List[str]):
for unsupported_tox_env in unsupported_values:
if unsupported_tox_env in selected_set:
selected_set.remove(unsupported_tox_env)
for unsupported_check in unsupported_values:
if unsupported_check in selected_set:
selected_set.remove(unsupported_check)


def process_ci_skips(glob_string: str, service: str) -> None:
Expand Down Expand Up @@ -93,7 +93,7 @@ def process_ci_skips(glob_string: str, service: str) -> None:
"-o",
"--override",
dest="override_set",
help='If you have a set of tox environments that should override the defaults, provide it here. In CI this is runtime variable $(ChecksOverride). EG: "whl,sdist".',
help='If you have a set of checks that should override the defaults, provide it here. In CI this is runtime variable $(ChecksOverride). EG: "whl,sdist".',
)

parser.add_argument(
Expand Down