Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
7 changes: 1 addition & 6 deletions master/custom/branches.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
from functools import total_ordering
from typing import Any


# Buildbot configuration first; see below for the BranchInfo class.

def generate_branches():
Expand All @@ -36,7 +37,6 @@ def generate_branches():
yield _maintenance_branch(3, 13)
yield _maintenance_branch(3, 12)
yield _maintenance_branch(3, 11)
yield _maintenance_branch(3, 10)
yield BranchInfo(
'PR',
version_tuple=None,
Expand All @@ -60,11 +60,6 @@ def _maintenance_branch(major, minor, **kwargs):
sort_key=-minor,
)

if version_tuple < (3, 11):
# Before 3.11, test_asyncio wasn't split out, and refleaks tests
# need more time.
result.monolithic_test_asyncio = True

if version_tuple < (3, 13):
# Free-threaded builds are available since 3.13
result.gil_only = True
Expand Down
5 changes: 0 additions & 5 deletions master/custom/factories.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,6 @@ def setup(self, branch, worker, test_with_PTY=False, **kwargs):
# Adjust the timeout for this worker
self.test_timeout *= worker.timeout_factor

# In 3.10, test_asyncio wasn't split out, and refleaks tests
# need more time.
if branch.monolithic_test_asyncio and has_option("-R", self.testFlags):
self.test_timeout *= 2

if self.build_out_of_tree:
self.addStep(
ShellCommand(
Expand Down
Loading