Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Merge run_hypothesis into run_tests
  • Loading branch information
AA-Turner committed Feb 5, 2025
commit e183b1521a715faeb1e7516c3a58b178090931b9
10 changes: 2 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ jobs:
runs-on: ubuntu-24.04
timeout-minutes: 60
needs: check_source
if: needs.check_source.outputs.run-tests == 'true' && needs.check_source.outputs.run-hypothesis == 'true'
if: needs.check_source.outputs.run-tests == 'true'
env:
OPENSSL_VER: 3.0.15
PYTHONSTRICTEXTENSIONBUILD: 1
Expand Down Expand Up @@ -657,6 +657,7 @@ jobs:
build_windows,
build_asan,
build_tsan,
test_hypothesis,
'
|| ''
}}
Expand All @@ -667,11 +668,4 @@ jobs:
'
|| ''
}}
${{
!fromJSON(needs.check_source.outputs.run-hypothesis)
&& '
test_hypothesis,
'
|| ''
}}
jobs: ${{ toJSON(needs) }}
5 changes: 0 additions & 5 deletions .github/workflows/reusable-change-detection.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ on: # yamllint disable-line rule:truthy
description: Whether to run the MSI installer smoke tests
value: >- # bool
${{ jobs.compute-changes.outputs.run-windows-msi || false }}
run-hypothesis:
description: Whether to run the Hypothesis tests
value: >- # bool
${{ jobs.compute-changes.outputs.run-hypothesis || false }}
run-ci-fuzz:
description: Whether to run the CIFuzz job
value: >- # bool
Expand All @@ -54,7 +50,6 @@ jobs:
config-hash: ${{ steps.config-hash.outputs.hash }}
run-ci-fuzz: ${{ steps.changes.outputs.run-ci-fuzz }}
run-docs: ${{ steps.changes.outputs.run-docs }}
run-hypothesis: ${{ steps.changes.outputs.run-hypothesis }}
run-tests: ${{ steps.changes.outputs.run-tests }}
run-windows-msi: ${{ steps.changes.outputs.run-windows-msi }}
steps:
Expand Down
12 changes: 0 additions & 12 deletions Tools/build/compute-changes.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
class Outputs:
run_ci_fuzz: bool = False
run_docs: bool = False
run_hypothesis: bool = False
run_tests: bool = False
run_windows_msi: bool = False

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

if outputs.run_hypothesis:
print("Run Hypothesis tests")

if outputs.run_ci_fuzz:
print("Run CIFuzz tests")
else:
Expand Down Expand Up @@ -151,13 +147,6 @@ def process_target_branch(outputs: Outputs, git_branch: str) -> Outputs:
if not git_branch:
outputs.run_tests = True

# Check if we should run the Hypothesis tests
if git_branch in {"3.9", "3.10", "3.11"}:
print("Branch too old for Hypothesis tests")
outputs.run_hypothesis = False
else:
outputs.run_hypothesis = outputs.run_tests

# OSS-Fuzz maintains a configuration for fuzzing the main branch of
# CPython, so CIFuzz should be run only for code that is likely to be
# merged into the main branch; compatibility with older branches may
Expand All @@ -182,7 +171,6 @@ def write_github_output(outputs: Outputs) -> None:
with open(os.environ["GITHUB_OUTPUT"], "a", encoding="utf-8") as f:
f.write(f"run-ci-fuzz={bool_lower(outputs.run_ci_fuzz)}\n")
f.write(f"run-docs={bool_lower(outputs.run_docs)}\n")
f.write(f"run-hypothesis={bool_lower(outputs.run_hypothesis)}\n")
f.write(f"run-tests={bool_lower(outputs.run_tests)}\n")
f.write(f"run-windows-msi={bool_lower(outputs.run_windows_msi)}\n")

Expand Down