diff --git a/buildbot-mock.patch b/buildbot-mock.patch
deleted file mode 100644
index 3cdb29d..0000000
--- a/buildbot-mock.patch
+++ /dev/null
@@ -1,581 +0,0 @@
-diff -up ./buildbot-3.7.0/buildbot/test/fake/fakebuild.py.mock ./buildbot-3.7.0/buildbot/test/fake/fakebuild.py
---- ./buildbot-3.7.0/buildbot/test/fake/fakebuild.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-3.7.0/buildbot/test/fake/fakebuild.py	2023-01-26 13:52:42.140714630 -0700
-@@ -15,7 +15,7 @@
- 
- import posixpath
- 
--import mock
-+from unittest import mock
- 
- from buildbot import config
- from buildbot.process import factory
-diff -up ./buildbot-3.7.0/buildbot/test/fake/fakemaster.py.mock ./buildbot-3.7.0/buildbot/test/fake/fakemaster.py
---- ./buildbot-3.7.0/buildbot/test/fake/fakemaster.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-3.7.0/buildbot/test/fake/fakemaster.py	2023-01-26 13:52:42.202714410 -0700
-@@ -16,7 +16,7 @@
- 
- import weakref
- 
--import mock
-+from unittest import mock
- 
- from twisted.internet import defer
- from twisted.internet import reactor
-diff -up ./buildbot-3.7.0/buildbot/test/fake/httpclientservice.py.mock ./buildbot-3.7.0/buildbot/test/fake/httpclientservice.py
---- ./buildbot-3.7.0/buildbot/test/fake/httpclientservice.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-3.7.0/buildbot/test/fake/httpclientservice.py	2023-01-26 13:52:42.205714400 -0700
-@@ -16,7 +16,7 @@
- 
- import json as jsonmodule
- 
--import mock
-+from unittest import mock
- 
- from twisted.internet import defer
- from twisted.logger import Logger
-diff -up ./buildbot-3.7.0/buildbot/test/fake/web.py.mock ./buildbot-3.7.0/buildbot/test/fake/web.py
---- ./buildbot-3.7.0/buildbot/test/fake/web.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-3.7.0/buildbot/test/fake/web.py	2023-01-26 13:52:42.231714308 -0700
-@@ -15,7 +15,7 @@
- 
- from io import BytesIO
- 
--from mock import Mock
-+from unittest.mock import Mock
- 
- from twisted.internet import defer
- from twisted.web import server
-diff -up ./buildbot-3.7.0/buildbot/test/__init__.py.mock ./buildbot-3.7.0/buildbot/test/__init__.py
---- ./buildbot-3.7.0/buildbot/test/__init__.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-3.7.0/buildbot/test/__init__.py	2023-01-26 13:52:42.238714283 -0700
-@@ -25,9 +25,9 @@ from buildbot.test.util.warnings import
- from buildbot.test.util.warnings import assertProducesWarnings  # noqa pylint: disable=wrong-import-position
- from buildbot.warnings import DeprecatedApiWarning  # noqa pylint: disable=wrong-import-position
- 
--# import mock so we bail out early if it's not installed
-+# from unittest import mock so we bail out early if it's not installed
- try:
--    import mock
-+    from unittest import mock
-     [mock]
- except ImportError as e:
-     raise ImportError("\nBuildbot tests require the 'mock' module; "
-diff -up ./buildbot-3.7.0/buildbot/test/integration/test_telegram_bot.py.mock ./buildbot-3.7.0/buildbot/test/integration/test_telegram_bot.py
---- ./buildbot-3.7.0/buildbot/test/integration/test_telegram_bot.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-3.7.0/buildbot/test/integration/test_telegram_bot.py	2023-01-26 13:52:42.240714276 -0700
-@@ -15,7 +15,7 @@
- 
- import json
- 
--import mock
-+from unittest import mock
- 
- from twisted.internet import defer
- from twisted.internet import reactor
-diff -up ./buildbot-3.7.0/buildbot/test/integration/test_try_client.py.mock ./buildbot-3.7.0/buildbot/test/integration/test_try_client.py
---- ./buildbot-3.7.0/buildbot/test/integration/test_try_client.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-3.7.0/buildbot/test/integration/test_try_client.py	2023-01-26 13:52:42.242714269 -0700
-@@ -16,7 +16,7 @@
- 
- import os
- 
--import mock
-+from unittest import mock
- 
- from twisted.internet import defer
- from twisted.internet import reactor
-diff -up ./buildbot-3.7.0/buildbot/test/integration/test_www.py.mock ./buildbot-3.7.0/buildbot/test/integration/test_www.py
---- ./buildbot-3.7.0/buildbot/test/integration/test_www.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-3.7.0/buildbot/test/integration/test_www.py	2023-01-26 13:52:42.272714163 -0700
-@@ -16,7 +16,7 @@
- 
- import json
- 
--import mock
-+from unittest import mock
- 
- from twisted.internet import defer
- from twisted.internet import protocol
-diff -up ./buildbot-3.7.0/buildbot/test/steps.py.mock ./buildbot-3.7.0/buildbot/test/steps.py
---- ./buildbot-3.7.0/buildbot/test/steps.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-3.7.0/buildbot/test/steps.py	2023-01-26 13:52:42.275714153 -0700
-@@ -17,7 +17,7 @@ import stat
- import tarfile
- from io import BytesIO
- 
--import mock
-+from unittest import mock
- 
- from twisted.internet import defer
- from twisted.python import log
-diff -up ./buildbot-3.7.0/buildbot/test/unit/test_clients_sendchange.py.mock ./buildbot-3.7.0/buildbot/test/unit/test_clients_sendchange.py
---- ./buildbot-3.7.0/buildbot/test/unit/test_clients_sendchange.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-3.7.0/buildbot/test/unit/test_clients_sendchange.py	2023-01-26 13:52:42.277714146 -0700
-@@ -13,7 +13,7 @@
- #
- # Copyright Buildbot Team Members
- 
--import mock
-+from unittest import mock
- 
- from twisted.internet import defer
- from twisted.internet import reactor
-diff -up ./buildbot-3.7.0/buildbot/test/unit/test_clients_usersclient.py.mock ./buildbot-3.7.0/buildbot/test/unit/test_clients_usersclient.py
---- ./buildbot-3.7.0/buildbot/test/unit/test_clients_usersclient.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-3.7.0/buildbot/test/unit/test_clients_usersclient.py	2023-01-26 13:52:42.336713937 -0700
-@@ -13,7 +13,7 @@
- #
- # Copyright Buildbot Team Members
- 
--import mock
-+from unittest import mock
- 
- from twisted.internet import defer
- from twisted.internet import reactor
-diff -up ./buildbot-3.7.0/buildbot/test/unit/test_janitor_configurator.py.mock ./buildbot-3.7.0/buildbot/test/unit/test_janitor_configurator.py
---- ./buildbot-3.7.0/buildbot/test/unit/test_janitor_configurator.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-3.7.0/buildbot/test/unit/test_janitor_configurator.py	2023-01-26 13:52:42.362713845 -0700
-@@ -19,7 +19,7 @@ from datetime import timedelta
- 
- from parameterized import parameterized
- 
--import mock
-+from unittest import mock
- 
- from twisted.internet import defer
- from twisted.trial import unittest
-diff -up ./buildbot-3.7.0/buildbot/test/unit/test_locks.py.mock ./buildbot-3.7.0/buildbot/test/unit/test_locks.py
---- ./buildbot-3.7.0/buildbot/test/unit/test_locks.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-3.7.0/buildbot/test/unit/test_locks.py	2023-01-26 13:52:42.417713651 -0700
-@@ -15,7 +15,7 @@
- 
- from parameterized import parameterized
- 
--import mock
-+from unittest import mock
- 
- from twisted.internet import defer
- from twisted.trial import unittest
-diff -up ./buildbot-3.7.0/buildbot/test/unit/test_master.py.mock ./buildbot-3.7.0/buildbot/test/unit/test_master.py
---- ./buildbot-3.7.0/buildbot/test/unit/test_master.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-3.7.0/buildbot/test/unit/test_master.py	2023-01-26 13:52:42.510713322 -0700
-@@ -17,7 +17,7 @@
- import os
- import signal
- 
--import mock
-+from unittest import mock
- 
- from twisted.internet import defer
- from twisted.internet import reactor
-diff -up ./buildbot-3.7.0/buildbot/test/unit/test_mq_base.py.mock ./buildbot-3.7.0/buildbot/test/unit/test_mq_base.py
---- ./buildbot-3.7.0/buildbot/test/unit/test_mq_base.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-3.7.0/buildbot/test/unit/test_mq_base.py	2023-01-26 13:52:42.536713230 -0700
-@@ -14,7 +14,7 @@
- # Copyright Buildbot Team Members
- 
- 
--import mock
-+from unittest import mock
- 
- from twisted.internet import defer
- from twisted.python import failure
-diff -up ./buildbot-3.7.0/buildbot/test/unit/test_mq_connector.py.mock ./buildbot-3.7.0/buildbot/test/unit/test_mq_connector.py
---- ./buildbot-3.7.0/buildbot/test/unit/test_mq_connector.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-3.7.0/buildbot/test/unit/test_mq_connector.py	2023-01-26 13:52:42.559713149 -0700
-@@ -13,7 +13,7 @@
- #
- # Copyright Buildbot Team Members
- 
--import mock
-+from unittest import mock
- 
- from twisted.internet import defer
- from twisted.trial import unittest
-diff -up ./buildbot-3.7.0/buildbot/test/unit/test_mq.py.mock ./buildbot-3.7.0/buildbot/test/unit/test_mq.py
---- ./buildbot-3.7.0/buildbot/test/unit/test_mq.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-3.7.0/buildbot/test/unit/test_mq.py	2023-01-26 13:52:42.565713128 -0700
-@@ -13,7 +13,7 @@
- #
- # Copyright Buildbot Team Members
- 
--import mock
-+from unittest import mock
- 
- from twisted.internet import defer
- from twisted.trial import unittest
-diff -up ./buildbot-3.7.0/buildbot/test/unit/test_mq_simple.py.mock ./buildbot-3.7.0/buildbot/test/unit/test_mq_simple.py
---- ./buildbot-3.7.0/buildbot/test/unit/test_mq_simple.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-3.7.0/buildbot/test/unit/test_mq_simple.py	2023-01-26 13:52:42.568713117 -0700
-@@ -13,7 +13,7 @@
- #
- # Copyright Buildbot Team Members
- 
--import mock
-+from unittest import mock
- 
- from twisted.internet import defer
- from twisted.trial import unittest
-diff -up ./buildbot-3.7.0/buildbot/test/unit/test_mq_wamp.py.mock ./buildbot-3.7.0/buildbot/test/unit/test_mq_wamp.py
---- ./buildbot-3.7.0/buildbot/test/unit/test_mq_wamp.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-3.7.0/buildbot/test/unit/test_mq_wamp.py	2023-01-26 13:52:42.571713107 -0700
-@@ -17,7 +17,7 @@ import json
- import os
- import textwrap
- 
--import mock
-+from unittest import mock
- 
- from autobahn.wamp.exception import TransportLost
- from autobahn.wamp.types import SubscribeOptions
-diff -up ./buildbot-3.7.0/buildbot/test/unit/test_plugins.py.mock ./buildbot-3.7.0/buildbot/test/unit/test_plugins.py
---- ./buildbot-3.7.0/buildbot/test/unit/test_plugins.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-3.7.0/buildbot/test/unit/test_plugins.py	2023-01-26 13:52:42.627712908 -0700
-@@ -18,7 +18,7 @@ Unit tests for the plugin framework
- 
- import warnings
- 
--import mock
-+from unittest import mock
- 
- from twisted.trial import unittest
- from zope.interface import implementer
-diff -up ./buildbot-3.7.0/buildbot/test/unit/test_stats_service.py.mock ./buildbot-3.7.0/buildbot/test/unit/test_stats_service.py
---- ./buildbot-3.7.0/buildbot/test/unit/test_stats_service.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-3.7.0/buildbot/test/unit/test_stats_service.py	2023-01-26 13:52:42.632712891 -0700
-@@ -14,7 +14,7 @@
- # Copyright Buildbot Team Members
- 
- 
--import mock
-+from unittest import mock
- 
- from twisted.internet import defer
- from twisted.trial import unittest
-diff -up ./buildbot-3.7.0/buildbot/test/unit/test_util.py.mock ./buildbot-3.7.0/buildbot/test/unit/test_util.py
---- ./buildbot-3.7.0/buildbot/test/unit/test_util.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-3.7.0/buildbot/test/unit/test_util.py	2023-01-26 13:52:42.637712873 -0700
-@@ -17,7 +17,7 @@ import datetime
- import locale
- import os
- 
--import mock
-+from unittest import mock
- 
- from twisted.internet import reactor
- from twisted.internet import task
-diff -up ./buildbot-3.7.0/buildbot/test/unit/test_wamp_connector.py.mock ./buildbot-3.7.0/buildbot/test/unit/test_wamp_connector.py
---- ./buildbot-3.7.0/buildbot/test/unit/test_wamp_connector.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-3.7.0/buildbot/test/unit/test_wamp_connector.py	2023-01-26 13:52:42.644712848 -0700
-@@ -15,7 +15,7 @@
- 
- from parameterized import parameterized
- 
--import mock
-+from unittest import mock
- 
- from twisted.internet import defer
- from twisted.trial import unittest
-diff -up ./buildbot-3.7.0/buildbot/test/util/integration.py.mock ./buildbot-3.7.0/buildbot/test/util/integration.py
---- ./buildbot-3.7.0/buildbot/test/util/integration.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-3.7.0/buildbot/test/util/integration.py	2023-01-26 13:52:42.674712742 -0700
-@@ -19,7 +19,7 @@ import sys
- from io import StringIO
- from unittest.case import SkipTest
- 
--import mock
-+from unittest import mock
- 
- from twisted.internet import defer
- from twisted.internet import reactor
-diff -up ./buildbot-3.7.0/buildbot/test/util/patch_delay.py.mock ./buildbot-3.7.0/buildbot/test/util/patch_delay.py
---- ./buildbot-3.7.0/buildbot/test/util/patch_delay.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-3.7.0/buildbot/test/util/patch_delay.py	2023-01-26 13:52:42.676712735 -0700
-@@ -22,7 +22,7 @@
- import contextlib
- import functools
- 
--import mock
-+from unittest import mock
- 
- from twisted.internet import defer
- 
-diff -up ./buildbot-3.7.0/buildbot/test/util/pbmanager.py.mock ./buildbot-3.7.0/buildbot/test/util/pbmanager.py
---- ./buildbot-3.7.0/buildbot/test/util/pbmanager.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-3.7.0/buildbot/test/util/pbmanager.py	2023-01-26 13:52:42.681712718 -0700
-@@ -14,7 +14,7 @@
- # Copyright Buildbot Team Members
- 
- 
--import mock
-+from unittest import mock
- 
- from twisted.internet import defer
- 
-diff -up ./buildbot-3.7.0/buildbot/test/util/sourcesteps.py.mock ./buildbot-3.7.0/buildbot/test/util/sourcesteps.py
---- ./buildbot-3.7.0/buildbot/test/util/sourcesteps.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-3.7.0/buildbot/test/util/sourcesteps.py	2023-01-26 13:52:42.695712668 -0700
-@@ -14,7 +14,7 @@
- # Copyright Buildbot Team Members
- 
- 
--import mock
-+from unittest import mock
- 
- from buildbot.test.steps import TestBuildStepMixin
- 
-diff -up ./buildbot-3.7.0/buildbot/test/util/www.py.mock ./buildbot-3.7.0/buildbot/test/util/www.py
---- ./buildbot-3.7.0/buildbot/test/util/www.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-3.7.0/buildbot/test/util/www.py	2023-01-26 13:52:42.699712654 -0700
-@@ -22,7 +22,7 @@ from urllib.parse import parse_qs
- from urllib.parse import unquote as urlunquote
- from uuid import uuid1
- 
--import mock
-+from unittest import mock
- 
- from twisted.internet import defer
- from twisted.web import server
-diff -up ./buildbot-3.7.0/setup.py.mock ./buildbot-3.7.0/setup.py
---- ./buildbot-3.7.0/setup.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-3.7.0/setup.py	2023-01-26 13:52:42.713712605 -0700
-@@ -286,8 +286,6 @@ setup_args = {
-             ('buildbot.steps.package.deb.pbuilder', [
-                 'DebPbuilder', 'DebCowbuilder', 'UbuPbuilder',
-                 'UbuCowbuilder']),
--            ('buildbot.steps.package.rpm.mock', [
--                'Mock', 'MockBuildSRPM', 'MockRebuild']),
-             ('buildbot.steps.package.rpm.rpmbuild', ['RpmBuild']),
-             ('buildbot.steps.package.rpm.rpmlint', ['RpmLint']),
-             ('buildbot.steps.python', [
-@@ -522,7 +520,6 @@ test_deps = [
-     # boto3 and moto required for running EC2 tests
-     'boto3',
-     'moto',
--    'mock>=2.0.0',
-     'parameterized',
- ]
- if sys.platform != 'win32':
-diff -up ./buildbot-badges-3.7.0/buildbot_badges/__init__.py.mock ./buildbot-badges-3.7.0/buildbot_badges/__init__.py
-diff -up ./buildbot-badges-3.7.0/setup.py.mock ./buildbot-badges-3.7.0/setup.py
-diff -up ./buildbot-console-view-3.7.0/buildbot_console_view/__init__.py.mock ./buildbot-console-view-3.7.0/buildbot_console_view/__init__.py
-diff -up ./buildbot-console-view-3.7.0/setup.py.mock ./buildbot-console-view-3.7.0/setup.py
-diff -up ./buildbot-grid-view-3.7.0/buildbot_grid_view/__init__.py.mock ./buildbot-grid-view-3.7.0/buildbot_grid_view/__init__.py
-diff -up ./buildbot-grid-view-3.7.0/setup.py.mock ./buildbot-grid-view-3.7.0/setup.py
-diff -up ./buildbot-pkg-3.7.0/buildbot_pkg.py.mock ./buildbot-pkg-3.7.0/buildbot_pkg.py
-diff -up ./buildbot-pkg-3.7.0/setup.py.mock ./buildbot-pkg-3.7.0/setup.py
-diff -up ./buildbot-waterfall-view-3.7.0/buildbot_waterfall_view/__init__.py.mock ./buildbot-waterfall-view-3.7.0/buildbot_waterfall_view/__init__.py
-diff -up ./buildbot-waterfall-view-3.7.0/setup.py.mock ./buildbot-waterfall-view-3.7.0/setup.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/backports/__init__.py.mock ./buildbot-worker-3.7.0/buildbot_worker/backports/__init__.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/base.py.mock ./buildbot-worker-3.7.0/buildbot_worker/base.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/bot.py.mock ./buildbot-worker-3.7.0/buildbot_worker/bot.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/commands/base.py.mock ./buildbot-worker-3.7.0/buildbot_worker/commands/base.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/commands/fs.py.mock ./buildbot-worker-3.7.0/buildbot_worker/commands/fs.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/commands/__init__.py.mock ./buildbot-worker-3.7.0/buildbot_worker/commands/__init__.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/commands/registry.py.mock ./buildbot-worker-3.7.0/buildbot_worker/commands/registry.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/commands/shell.py.mock ./buildbot-worker-3.7.0/buildbot_worker/commands/shell.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/commands/transfer.py.mock ./buildbot-worker-3.7.0/buildbot_worker/commands/transfer.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/commands/utils.py.mock ./buildbot-worker-3.7.0/buildbot_worker/commands/utils.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/compat.py.mock ./buildbot-worker-3.7.0/buildbot_worker/compat.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/exceptions.py.mock ./buildbot-worker-3.7.0/buildbot_worker/exceptions.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/__init__.py.mock ./buildbot-worker-3.7.0/buildbot_worker/__init__.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/interfaces.py.mock ./buildbot-worker-3.7.0/buildbot_worker/interfaces.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/monkeypatches/__init__.py.mock ./buildbot-worker-3.7.0/buildbot_worker/monkeypatches/__init__.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/monkeypatches/testcase_assert.py.mock ./buildbot-worker-3.7.0/buildbot_worker/monkeypatches/testcase_assert.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/msgpack.py.mock ./buildbot-worker-3.7.0/buildbot_worker/msgpack.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/null.py.mock ./buildbot-worker-3.7.0/buildbot_worker/null.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/pb.py.mock ./buildbot-worker-3.7.0/buildbot_worker/pb.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/pbutil.py.mock ./buildbot-worker-3.7.0/buildbot_worker/pbutil.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/runprocess.py.mock ./buildbot-worker-3.7.0/buildbot_worker/runprocess.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/scripts/base.py.mock ./buildbot-worker-3.7.0/buildbot_worker/scripts/base.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/scripts/create_worker.py.mock ./buildbot-worker-3.7.0/buildbot_worker/scripts/create_worker.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/scripts/__init__.py.mock ./buildbot-worker-3.7.0/buildbot_worker/scripts/__init__.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/scripts/logwatcher.py.mock ./buildbot-worker-3.7.0/buildbot_worker/scripts/logwatcher.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/scripts/restart.py.mock ./buildbot-worker-3.7.0/buildbot_worker/scripts/restart.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/scripts/runner.py.mock ./buildbot-worker-3.7.0/buildbot_worker/scripts/runner.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/scripts/start.py.mock ./buildbot-worker-3.7.0/buildbot_worker/scripts/start.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/scripts/stop.py.mock ./buildbot-worker-3.7.0/buildbot_worker/scripts/stop.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/scripts/windows_service.py.mock ./buildbot-worker-3.7.0/buildbot_worker/scripts/windows_service.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/test/fake/__init__.py.mock ./buildbot-worker-3.7.0/buildbot_worker/test/fake/__init__.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/test/fake/protocolcommand.py.mock ./buildbot-worker-3.7.0/buildbot_worker/test/fake/protocolcommand.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/test/fake/reactor.py.mock ./buildbot-worker-3.7.0/buildbot_worker/test/fake/reactor.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/test/fake/remote.py.mock ./buildbot-worker-3.7.0/buildbot_worker/test/fake/remote.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/test/fake/runprocess.py.mock ./buildbot-worker-3.7.0/buildbot_worker/test/fake/runprocess.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/test/__init__.py.mock ./buildbot-worker-3.7.0/buildbot_worker/test/__init__.py
---- ./buildbot-worker-3.7.0/buildbot_worker/test/__init__.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-worker-3.7.0/buildbot_worker/test/__init__.py	2023-01-26 13:52:42.716712594 -0700
-@@ -57,9 +57,9 @@ add_debugging_monkeypatches()
- 
- __all__ = []
- 
--# import mock so we bail out early if it's not installed
-+# from unittest import mock so we bail out early if it's not installed
- try:
--    import mock
-+    from unittest import mock
-     [mock]
- except ImportError:
-     raise ImportError("Buildbot tests require the 'mock' module; "
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/test/reactor.py.mock ./buildbot-worker-3.7.0/buildbot_worker/test/reactor.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/test/test_extra_coverage.py.mock ./buildbot-worker-3.7.0/buildbot_worker/test/test_extra_coverage.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/test/test_util_hangcheck.py.mock ./buildbot-worker-3.7.0/buildbot_worker/test/test_util_hangcheck.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/test/unit/__init__.py.mock ./buildbot-worker-3.7.0/buildbot_worker/test/unit/__init__.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/test/unit/runprocess-scripts.py.mock ./buildbot-worker-3.7.0/buildbot_worker/test/unit/runprocess-scripts.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_bot.py.mock ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_bot.py
---- ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_bot.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_bot.py	2023-01-26 13:52:42.721712576 -0700
-@@ -21,7 +21,7 @@ import multiprocessing
- import os
- import shutil
- 
--import mock
-+from unittest import mock
- 
- from twisted.internet import defer
- from twisted.internet import reactor
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_bot_Worker.py.mock ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_bot_Worker.py
---- ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_bot_Worker.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_bot_Worker.py	2023-01-26 13:52:42.725712562 -0700
-@@ -20,7 +20,7 @@ import os
- import shutil
- import socket
- 
--from mock import Mock
-+from unittest.mock import Mock
- 
- from twisted.cred import checkers
- from twisted.cred import portal
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_commands_base.py.mock ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_commands_base.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_commands_fs.py.mock ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_commands_fs.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_commands_registry.py.mock ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_commands_registry.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_commands_shell.py.mock ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_commands_shell.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_commands_transfer.py.mock ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_commands_transfer.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_commands_utils.py.mock ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_commands_utils.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_msgpack.py.mock ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_msgpack.py
---- ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_msgpack.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_msgpack.py	2023-01-26 13:52:42.736712523 -0700
-@@ -20,7 +20,7 @@ import time
- 
- from parameterized import parameterized
- 
--import mock
-+from unittest import mock
- 
- from twisted.application import service
- from twisted.internet import defer
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_runprocess.py.mock ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_runprocess.py
---- ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_runprocess.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_runprocess.py	2023-01-26 13:52:42.739712513 -0700
-@@ -26,7 +26,7 @@ import time
- 
- import psutil
- 
--from mock import Mock
-+from unittest.mock import Mock
- 
- from twisted.internet import defer
- from twisted.internet import reactor
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_scripts_base.py.mock ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_scripts_base.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_scripts_create_worker.py.mock ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_scripts_create_worker.py
---- ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_scripts_create_worker.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_scripts_create_worker.py	2023-01-26 13:52:42.744712495 -0700
-@@ -18,7 +18,7 @@ from __future__ import print_function
- 
- import os
- 
--import mock
-+from unittest import mock
- 
- from twisted.trial import unittest
- 
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_scripts_restart.py.mock ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_scripts_restart.py
---- ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_scripts_restart.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_scripts_restart.py	2023-01-26 13:52:42.745712492 -0700
-@@ -16,7 +16,7 @@
- from __future__ import absolute_import
- from __future__ import print_function
- 
--import mock
-+from unittest import mock
- 
- from twisted.trial import unittest
- 
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_scripts_runner.py.mock ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_scripts_runner.py
---- ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_scripts_runner.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_scripts_runner.py	2023-01-26 13:52:42.747712485 -0700
-@@ -19,7 +19,7 @@ from __future__ import print_function
- import os
- import sys
- 
--import mock
-+from unittest import mock
- 
- from twisted.python import log
- from twisted.python import usage
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_scripts_start.py.mock ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_scripts_start.py
---- ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_scripts_start.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_scripts_start.py	2023-01-26 13:52:42.749712477 -0700
-@@ -16,7 +16,7 @@
- from __future__ import absolute_import
- from __future__ import print_function
- 
--import mock
-+from unittest import mock
- 
- from twisted.trial import unittest
- 
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_scripts_stop.py.mock ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_scripts_stop.py
---- ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_scripts_stop.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_scripts_stop.py	2023-01-26 13:52:42.763712428 -0700
-@@ -21,7 +21,7 @@ import os
- import signal
- import time
- 
--import mock
-+from unittest import mock
- 
- from twisted.trial import unittest
- 
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_util_deferwaiter.py.mock ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_util_deferwaiter.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_util.py.mock ./buildbot-worker-3.7.0/buildbot_worker/test/unit/test_util.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/test/util/command.py.mock ./buildbot-worker-3.7.0/buildbot_worker/test/util/command.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/test/util/compat.py.mock ./buildbot-worker-3.7.0/buildbot_worker/test/util/compat.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/test/util/__init__.py.mock ./buildbot-worker-3.7.0/buildbot_worker/test/util/__init__.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/test/util/misc.py.mock ./buildbot-worker-3.7.0/buildbot_worker/test/util/misc.py
---- ./buildbot-worker-3.7.0/buildbot_worker/test/util/misc.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-worker-3.7.0/buildbot_worker/test/util/misc.py	2023-01-26 13:52:42.766712417 -0700
-@@ -31,7 +31,7 @@ import sys
- from io import BytesIO
- from io import StringIO
- 
--import mock
-+from unittest import mock
- 
- from twisted.python import log
- 
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/test/util/sourcecommand.py.mock ./buildbot-worker-3.7.0/buildbot_worker/test/util/sourcecommand.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/test/util/test_buffer_manager.py.mock ./buildbot-worker-3.7.0/buildbot_worker/test/util/test_buffer_manager.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/test/util/test_lineboundaries.py.mock ./buildbot-worker-3.7.0/buildbot_worker/test/util/test_lineboundaries.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/tunnel.py.mock ./buildbot-worker-3.7.0/buildbot_worker/tunnel.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/util/buffer_manager.py.mock ./buildbot-worker-3.7.0/buildbot_worker/util/buffer_manager.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/util/deferwaiter.py.mock ./buildbot-worker-3.7.0/buildbot_worker/util/deferwaiter.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/util/_hangcheck.py.mock ./buildbot-worker-3.7.0/buildbot_worker/util/_hangcheck.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/util/__init__.py.mock ./buildbot-worker-3.7.0/buildbot_worker/util/__init__.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/util/lineboundaries.py.mock ./buildbot-worker-3.7.0/buildbot_worker/util/lineboundaries.py
-diff -up ./buildbot-worker-3.7.0/buildbot_worker/util/_notifier.py.mock ./buildbot-worker-3.7.0/buildbot_worker/util/_notifier.py
-diff -up ./buildbot-worker-3.7.0/setup.py.mock ./buildbot-worker-3.7.0/setup.py
---- ./buildbot-worker-3.7.0/setup.py.mock	2022-12-04 04:48:49.000000000 -0700
-+++ ./buildbot-worker-3.7.0/setup.py	2023-01-26 13:52:42.769712407 -0700
-@@ -172,7 +172,6 @@ if setuptools is not None:
- 
-     # Unit test hard dependencies.
-     test_deps = [
--        'mock',
-         'psutil',
-     ]
- 
-diff -up ./buildbot-wsgi-dashboards-3.7.0/buildbot_wsgi_dashboards/__init__.py.mock ./buildbot-wsgi-dashboards-3.7.0/buildbot_wsgi_dashboards/__init__.py
-diff -up ./buildbot-wsgi-dashboards-3.7.0/setup.py.mock ./buildbot-wsgi-dashboards-3.7.0/setup.py
-diff -up ./buildbot-www-3.7.0/buildbot_www/__init__.py.mock ./buildbot-www-3.7.0/buildbot_www/__init__.py
-diff -up ./buildbot-www-3.7.0/setup.py.mock ./buildbot-www-3.7.0/setup.py
diff --git a/buildbot.spec b/buildbot.spec
index c7d276e..6a87e87 100644
--- a/buildbot.spec
+++ b/buildbot.spec
@@ -21,7 +21,7 @@
 
 Name:           buildbot
 Version:        3.9.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Build/test automation system
 License:        GPL-2.0-only
@@ -40,8 +40,7 @@ Source8:        %{pypi_source buildbot-pkg}
 # Service template units for buildbot instances
 Source10:       buildbot-master@.service
 Source11:       buildbot-worker@.service
-# https://github.com/buildbot/buildbot/pull/6780
-Patch0:         buildbot-mock.patch
+Patch:         twisted-pin.patch
 
 BuildArch:      noarch
 
@@ -321,8 +320,8 @@ Summary:        Buildbot documentation
 
 %prep
 %setup -q -b0 -b1 -b2 -b3 -b4 -b5 -b6 -b7 -b8
+%patch -P 0 -p1 -b .twisted
 cd ..
-#%patch0 -p1 -b .mock
 
 
 %build
@@ -399,6 +398,9 @@ trial buildbot.test
 %endif
 
 %changelog
+* Fri Sep 08 2023 Gwyn Ciesla <gwync@protonmail.com> - 3.9.2-2
+- Adjust twisted pin.
+
 * Tue Sep 05 2023 Gwyn Ciesla <gwync@protonmail.com> - 3.9.2-1
 - 3.9.2
 
diff --git a/twisted-pin.patch b/twisted-pin.patch
new file mode 100644
index 0000000..dec0b11
--- /dev/null
+++ b/twisted-pin.patch
@@ -0,0 +1,11 @@
+--- buildbot-3.9.2/setup.py~	2023-09-02 15:48:25.167284000 -0500
++++ buildbot-3.9.2/setup.py	2023-09-08 16:37:00.350198843 -0500
+@@ -488,7 +488,7 @@
+         if parse_version(pip_dist.version) < parse_version('1.4'):
+             raise RuntimeError(VERSION_MSG)
+ 
+-twisted_ver = ">= 18.7.0, <=22.10.0"
++twisted_ver = ">= 18.7.0"
+ 
+ bundle_version = version.split("-")[0]
+