Skip to content

Commit 584e975

Browse files
authored
Enable build of package that isn't compatible with 3.9 (#43829)
1 parent 3f377c7 commit 584e975

File tree

10 files changed

+27
-6
lines changed

10 files changed

+27
-6
lines changed

eng/pipelines/templates/steps/analyze.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,14 @@ steps:
8989
condition: and(succeededOrFailed(), ne(variables['Skip.VerifySdist'],'true'))
9090
inputs:
9191
scriptPath: 'scripts/devops_tasks/dispatch_tox.py'
92-
arguments: '"$(TargetingString)" --service=${{parameters.ServiceDirectory}} --toxenv=verifysdist ${{ parameters.AdditionalTestArgs }}'
92+
arguments: '"$(TargetingString)" --disable-compatibility-filter --service=${{parameters.ServiceDirectory}} --toxenv=verifysdist ${{ parameters.AdditionalTestArgs }}'
9393

9494
- task: PythonScript@0
9595
displayName: 'Verify whl'
9696
condition: and(succeededOrFailed(), ne(variables['Skip.VerifyWhl'],'true'))
9797
inputs:
9898
scriptPath: 'scripts/devops_tasks/dispatch_tox.py'
99-
arguments: '"$(TargetingString)" --service=${{parameters.ServiceDirectory}} --toxenv=verifywhl ${{ parameters.AdditionalTestArgs }}'
99+
arguments: '"$(TargetingString)" --disable-compatibility-filter --service=${{parameters.ServiceDirectory}} --toxenv=verifywhl ${{ parameters.AdditionalTestArgs }}'
100100

101101
- template: run_mypy.yml
102102
parameters:
@@ -123,7 +123,7 @@ steps:
123123
displayName: 'Run Keyword Validation Check'
124124
inputs:
125125
scriptPath: 'scripts/devops_tasks/dispatch_tox.py'
126-
arguments: '"$(TargetingString)" --service=${{parameters.ServiceDirectory}} --toxenv=verify_keywords ${{ parameters.AdditionalTestArgs }}'
126+
arguments: '"$(TargetingString)" --disable-compatibility-filter --service=${{parameters.ServiceDirectory}} --toxenv=verify_keywords ${{ parameters.AdditionalTestArgs }}'
127127
condition: and(succeededOrFailed(), ne(variables['Skip.KeywordCheck'],'true'))
128128

129129
- template: ../steps/run_bandit.yml

eng/pipelines/templates/steps/run_bandit.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ steps:
1717
--mark_arg="${{ parameters.TestMarkArgument }}"
1818
--service="${{ parameters.ServiceDirectory }}"
1919
--toxenv="bandit"
20+
--disable-compatibility-filter
2021
--disablecov
2122
${{ parameters.AdditionalTestArgs }}
2223
env: ${{ parameters.EnvVars }}

eng/pipelines/templates/steps/run_black.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ steps:
1414
"$(TargetingString)"
1515
--service="${{ parameters.ServiceDirectory }}"
1616
--checks="black"
17+
--disable-compatibility-filter
1718
--filter-type="Omit_management"
1819
${{ parameters.AdditionalTestArgs }}
1920
env:

eng/pipelines/templates/steps/run_breaking_changes.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ steps:
1414
--mark_arg="${{ parameters.TestMarkArgument }}"
1515
--service="${{ parameters.ServiceDirectory }}"
1616
--toxenv="breaking"
17+
--disable-compatibility-filter
1718
--disablecov
1819
env: ${{ parameters.EnvVars }}
1920
condition: and(succeededOrFailed(), ne(variables['Skip.BreakingChanges'],'true'))

eng/pipelines/templates/steps/run_mypy.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ steps:
1717
--service="${{ parameters.ServiceDirectory }}"
1818
--checks="mypy"
1919
--disablecov
20+
--disable-compatibility-filter
2021
${{ parameters.AdditionalTestArgs }}
2122
env:
2223
TOX_PIP_IMPL: "uv"

eng/pipelines/templates/steps/run_pylint.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ steps:
1515
"$(TargetingString)"
1616
--service="${{ parameters.ServiceDirectory }}"
1717
--checks="pylint"
18+
--disable-compatibility-filter
1819
--filter-type="Omit_management"
1920
${{ parameters.AdditionalTestArgs }}
2021
env:

eng/pipelines/templates/steps/run_pyright.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ steps:
1717
--mark_arg="${{ parameters.TestMarkArgument }}"
1818
--service="${{ parameters.ServiceDirectory }}"
1919
--toxenv="pyright"
20+
--disable-compatibility-filter
2021
--disablecov
2122
${{ parameters.AdditionalTestArgs }}
2223
condition: and(succeededOrFailed(), ne(variables['Skip.Pyright'],'true'))
@@ -30,6 +31,7 @@ steps:
3031
--mark_arg="${{ parameters.TestMarkArgument }}"
3132
--service="${{ parameters.ServiceDirectory }}"
3233
--toxenv="verifytypes"
34+
--disable-compatibility-filter
3335
--disablecov
3436
${{ parameters.AdditionalTestArgs }}
3537
condition: and(succeededOrFailed(), ne(variables['Skip.Verifytypes'],'true'))

eng/scripts/dispatch_checks.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,13 @@ def handler(signum, frame):
318318
help="Maximum number of concurrent checks (default: number of CPU cores).",
319319
)
320320

321+
parser.add_argument(
322+
"--disable-compatibility-filter",
323+
dest="disable_compatibility_filter",
324+
action="store_true",
325+
help="Flag to disable compatibility filter while discovering packages.",
326+
)
327+
321328
args = parser.parse_args()
322329

323330
configure_logging(args)
@@ -340,7 +347,7 @@ def handler(signum, frame):
340347
args.filter_type = "Build"
341348
compatibility_filter = False
342349
else:
343-
compatibility_filter = True
350+
compatibility_filter = not args.disable_compatibility_filter
344351

345352
targeted_packages = discover_targeted_packages(
346353
args.glob_string, target_dir, "", args.filter_type, compatibility_filter

eng/tools/azure-sdk-tools/ci_tools/build.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ def build() -> None:
161161
target_dir,
162162
args.package_filter_string,
163163
filter_type="Build",
164-
compatibility_filter=True,
164+
compatibility_filter=False,
165165
include_inactive=args.inactive,
166166
)
167167

scripts/devops_tasks/dispatch_tox.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,13 @@
114114
help="Location to generate any output files(if any). For e.g. apiview stub file",
115115
)
116116

117+
parser.add_argument(
118+
"--disable-compatibility-filter",
119+
dest="disable_compatibility_filter",
120+
action="store_true",
121+
help="Flag to disable compatibility filter while discovering packages.",
122+
)
123+
117124
args = parser.parse_args()
118125

119126
configure_logging(args)
@@ -132,7 +139,7 @@
132139
args.filter_type = "Build"
133140
compatibility_filter = False
134141
else:
135-
compatibility_filter = True
142+
compatibility_filter = not args.disable_compatibility_filter
136143

137144
targeted_packages = discover_targeted_packages(
138145
args.glob_string, target_dir, "", args.filter_type, compatibility_filter

0 commit comments

Comments
 (0)