Skip to content

Commit e183b15

Browse files
committed
Merge run_hypothesis into run_tests
1 parent 1ee4e0e commit e183b15

File tree

3 files changed

+2
-25
lines changed

3 files changed

+2
-25
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ jobs:
337337
runs-on: ubuntu-24.04
338338
timeout-minutes: 60
339339
needs: check_source
340-
if: needs.check_source.outputs.run-tests == 'true' && needs.check_source.outputs.run-hypothesis == 'true'
340+
if: needs.check_source.outputs.run-tests == 'true'
341341
env:
342342
OPENSSL_VER: 3.0.15
343343
PYTHONSTRICTEXTENSIONBUILD: 1
@@ -657,6 +657,7 @@ jobs:
657657
build_windows,
658658
build_asan,
659659
build_tsan,
660+
test_hypothesis,
660661
'
661662
|| ''
662663
}}
@@ -667,11 +668,4 @@ jobs:
667668
'
668669
|| ''
669670
}}
670-
${{
671-
!fromJSON(needs.check_source.outputs.run-hypothesis)
672-
&& '
673-
test_hypothesis,
674-
'
675-
|| ''
676-
}}
677671
jobs: ${{ toJSON(needs) }}

.github/workflows/reusable-change-detection.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@ on: # yamllint disable-line rule:truthy
3636
description: Whether to run the MSI installer smoke tests
3737
value: >- # bool
3838
${{ jobs.compute-changes.outputs.run-windows-msi || false }}
39-
run-hypothesis:
40-
description: Whether to run the Hypothesis tests
41-
value: >- # bool
42-
${{ jobs.compute-changes.outputs.run-hypothesis || false }}
4339
run-ci-fuzz:
4440
description: Whether to run the CIFuzz job
4541
value: >- # bool
@@ -54,7 +50,6 @@ jobs:
5450
config-hash: ${{ steps.config-hash.outputs.hash }}
5551
run-ci-fuzz: ${{ steps.changes.outputs.run-ci-fuzz }}
5652
run-docs: ${{ steps.changes.outputs.run-docs }}
57-
run-hypothesis: ${{ steps.changes.outputs.run-hypothesis }}
5853
run-tests: ${{ steps.changes.outputs.run-tests }}
5954
run-windows-msi: ${{ steps.changes.outputs.run-windows-msi }}
6055
steps:

Tools/build/compute-changes.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
class Outputs:
3434
run_ci_fuzz: bool = False
3535
run_docs: bool = False
36-
run_hypothesis: bool = False
3736
run_tests: bool = False
3837
run_windows_msi: bool = False
3938

@@ -54,9 +53,6 @@ def compute_changes() -> None:
5453
if outputs.run_tests:
5554
print("Run tests")
5655

57-
if outputs.run_hypothesis:
58-
print("Run Hypothesis tests")
59-
6056
if outputs.run_ci_fuzz:
6157
print("Run CIFuzz tests")
6258
else:
@@ -151,13 +147,6 @@ def process_target_branch(outputs: Outputs, git_branch: str) -> Outputs:
151147
if not git_branch:
152148
outputs.run_tests = True
153149

154-
# Check if we should run the Hypothesis tests
155-
if git_branch in {"3.9", "3.10", "3.11"}:
156-
print("Branch too old for Hypothesis tests")
157-
outputs.run_hypothesis = False
158-
else:
159-
outputs.run_hypothesis = outputs.run_tests
160-
161150
# OSS-Fuzz maintains a configuration for fuzzing the main branch of
162151
# CPython, so CIFuzz should be run only for code that is likely to be
163152
# merged into the main branch; compatibility with older branches may
@@ -182,7 +171,6 @@ def write_github_output(outputs: Outputs) -> None:
182171
with open(os.environ["GITHUB_OUTPUT"], "a", encoding="utf-8") as f:
183172
f.write(f"run-ci-fuzz={bool_lower(outputs.run_ci_fuzz)}\n")
184173
f.write(f"run-docs={bool_lower(outputs.run_docs)}\n")
185-
f.write(f"run-hypothesis={bool_lower(outputs.run_hypothesis)}\n")
186174
f.write(f"run-tests={bool_lower(outputs.run_tests)}\n")
187175
f.write(f"run-windows-msi={bool_lower(outputs.run_windows_msi)}\n")
188176

0 commit comments

Comments
 (0)