Make some dependency changes, support Python 3.10 and 3.11 (#5611)

Co-authored-by: jack1142 <6032823+jack1142@users.noreply.github.com>

tests/cogs/downloader/test_downloader.py

@@ -65,7 +65,6 @@ ancestor_rev = "c950fc05a540dd76b944719c2a3302da2e2f3090"
 descendant_rev = "fb99eb7d2d5bed514efc98fe6686b368f8425745"
 
 
-@pytest.mark.asyncio
 @pytest.mark.parametrize(
     "maybe_ancestor_rev,descendant_rev,returncode,expected",
     [(ancestor_rev, descendant_rev, 0, True), (descendant_rev, ancestor_rev, 1, False)],
@@ -86,7 +85,6 @@ async def test_is_ancestor(mocker, repo, maybe_ancestor_rev, descendant_rev, ret
     assert ret is expected
 
 
-@pytest.mark.asyncio
 async def test_is_ancestor_object_raise(mocker, repo):
     m = _mock_run(mocker, repo, 128, b"", b"fatal: Not a valid object name invalid1")
     with pytest.raises(UnknownRevision):
@@ -104,7 +102,6 @@ async def test_is_ancestor_object_raise(mocker, repo):
     )
 
 
-@pytest.mark.asyncio
 async def test_is_ancestor_commit_raise(mocker, repo):
     m = _mock_run(
         mocker,
@@ -130,7 +127,6 @@ async def test_is_ancestor_commit_raise(mocker, repo):
     )
 
 
-@pytest.mark.asyncio
 async def test_get_file_update_statuses(mocker, repo):
     old_rev = "c950fc05a540dd76b944719c2a3302da2e2f3090"
     new_rev = "fb99eb7d2d5bed514efc98fe6686b368f8425745"
@@ -160,7 +156,6 @@ async def test_get_file_update_statuses(mocker, repo):
     }
 
 
-@pytest.mark.asyncio
 async def test_is_module_modified(mocker, repo):
     old_rev = "c950fc05a540dd76b944719c2a3302da2e2f3090"
     new_rev = "fb99eb7d2d5bed514efc98fe6686b368f8425745"
@@ -184,7 +179,6 @@ async def test_is_module_modified(mocker, repo):
     assert ret is True
 
 
-@pytest.mark.asyncio
 async def test_get_full_sha1_success(mocker, repo):
     commit = "c950fc05a540dd76b944719c2a3302da2e2f3090"
     m = _mock_run(mocker, repo, 0, commit.encode())
@@ -196,7 +190,6 @@ async def test_get_full_sha1_success(mocker, repo):
     assert ret == commit
 
 
-@pytest.mark.asyncio
 async def test_get_full_sha1_notfound(mocker, repo):
     m = _mock_run(mocker, repo, 128, b"", b"fatal: Needed a single revision")
     with pytest.raises(UnknownRevision):
@@ -206,7 +199,6 @@ async def test_get_full_sha1_notfound(mocker, repo):
     )
 
 
-@pytest.mark.asyncio
 async def test_get_full_sha1_ambiguous(mocker, repo):
     m = _mock_run(
         mocker,
@@ -246,7 +238,6 @@ def test_update_available_modules(repo):
     )
 
 
-@pytest.mark.asyncio
 async def test_checkout(mocker, repo):
     commit = "c950fc05a540dd76b944719c2a3302da2e2f3090"
     m = _mock_run(mocker, repo, 0)
@@ -261,7 +252,6 @@ async def test_checkout(mocker, repo):
     )
 
 
-@pytest.mark.asyncio
 async def test_checkout_ctx_manager(mocker, repo):
     commit = "c950fc05a540dd76b944719c2a3302da2e2f3090"
     m = mocker.patch.object(repo, "_checkout", autospec=True, return_value=None)
@@ -273,7 +263,6 @@ async def test_checkout_ctx_manager(mocker, repo):
     m.assert_called_with(old_commit, force_checkout=False)
 
 
-@pytest.mark.asyncio
 async def test_checkout_await(mocker, repo):
     commit = "c950fc05a540dd76b944719c2a3302da2e2f3090"
     m = mocker.patch.object(repo, "_checkout", autospec=True, return_value=None)
@@ -282,7 +271,6 @@ async def test_checkout_await(mocker, repo):
     m.assert_called_once_with(commit, force_checkout=False)
 
 
-@pytest.mark.asyncio
 async def test_clone_with_branch(mocker, repo):
     branch = repo.branch = "dont_add_commits"
     commit = "a0ccc2390883c85a361f5a90c72e1b07958939fa"
@@ -300,7 +288,6 @@ async def test_clone_with_branch(mocker, repo):
     )
 
 
-@pytest.mark.asyncio
 async def test_clone_without_branch(mocker, repo):
     branch = "dont_add_commits"
     commit = "a0ccc2390883c85a361f5a90c72e1b07958939fa"
@@ -318,7 +305,6 @@ async def test_clone_without_branch(mocker, repo):
     )
 
 
-@pytest.mark.asyncio
 async def test_update(mocker, repo):
     old_commit = repo.commit
     new_commit = "a0ccc2390883c85a361f5a90c72e1b07958939fa"
@@ -335,7 +321,6 @@ async def test_update(mocker, repo):
 # old tests
 
 
-@pytest.mark.asyncio
 async def test_add_repo(monkeypatch, repo_manager):
     monkeypatch.setattr("redbot.cogs.downloader.repo_manager.Repo._run", fake_run_noprint)
     monkeypatch.setattr(
@@ -349,7 +334,6 @@ async def test_add_repo(monkeypatch, repo_manager):
     assert squid.available_modules == ()
 
 
-@pytest.mark.asyncio
 async def test_lib_install_requirements(monkeypatch, library_installable, repo, tmpdir):
     monkeypatch.setattr("redbot.cogs.downloader.repo_manager.Repo._run", fake_run_noprint)
     monkeypatch.setattr(
@@ -368,7 +352,6 @@ async def test_lib_install_requirements(monkeypatch, library_installable, repo,
     assert len(failed) == 0
 
 
-@pytest.mark.asyncio
 async def test_remove_repo(monkeypatch, repo_manager):
     monkeypatch.setattr("redbot.cogs.downloader.repo_manager.Repo._run", fake_run_noprint)
     monkeypatch.setattr(
@@ -383,7 +366,6 @@ async def test_remove_repo(monkeypatch, repo_manager):
     assert repo_manager.get_repo("squid") is None
 
 
-@pytest.mark.asyncio
 async def test_existing_repo(mocker, repo_manager):
     repo_manager.does_repo_exist = mocker.MagicMock(return_value=True)
 

tests/cogs/downloader/test_git.py

@@ -13,7 +13,6 @@ from redbot.pytest.downloader import (
 )
 
 
-@pytest.mark.asyncio
 async def test_git_clone_nobranch(git_repo, tmp_path):
     p = await git_repo._run(
         ProcessFormatter().format(
@@ -25,7 +24,6 @@ async def test_git_clone_nobranch(git_repo, tmp_path):
     assert p.returncode == 0
 
 
-@pytest.mark.asyncio
 async def test_git_clone_branch(git_repo, tmp_path):
     p = await git_repo._run(
         ProcessFormatter().format(
@@ -38,7 +36,6 @@ async def test_git_clone_branch(git_repo, tmp_path):
     assert p.returncode == 0
 
 
-@pytest.mark.asyncio
 async def test_git_clone_non_existent_branch(git_repo, tmp_path):
     p = await git_repo._run(
         ProcessFormatter().format(
@@ -51,7 +48,6 @@ async def test_git_clone_non_existent_branch(git_repo, tmp_path):
     assert p.returncode == 128
 
 
-@pytest.mark.asyncio
 async def test_git_clone_notgit_repo(git_repo, tmp_path):
     notgit_repo = tmp_path / "test_clone_folder"
     p = await git_repo._run(
@@ -62,7 +58,6 @@ async def test_git_clone_notgit_repo(git_repo, tmp_path):
     assert p.returncode == 128
 
 
-@pytest.mark.asyncio
 async def test_git_current_branch_master(git_repo):
     p = await git_repo._run(
         ProcessFormatter().format(git_repo.GIT_CURRENT_BRANCH, path=git_repo.folder_path)
@@ -71,7 +66,6 @@ async def test_git_current_branch_master(git_repo):
     assert p.stdout.decode().strip() == "master"
 
 
-@pytest.mark.asyncio
 async def test_git_current_branch_detached(git_repo):
     await git_repo._run(
         ProcessFormatter().format(
@@ -87,7 +81,6 @@ async def test_git_current_branch_detached(git_repo):
     assert p.stderr.decode().strip() == "fatal: ref HEAD is not a symbolic ref"
 
 
-@pytest.mark.asyncio
 async def test_git_current_commit_on_branch(git_repo):
     # HEAD on dont_add_commits (a0ccc2390883c85a361f5a90c72e1b07958939fa)
     # setup
@@ -105,7 +98,6 @@ async def test_git_current_commit_on_branch(git_repo):
     assert p.stdout.decode().strip() == "a0ccc2390883c85a361f5a90c72e1b07958939fa"
 
 
-@pytest.mark.asyncio
 async def test_git_current_commit_detached(git_repo):
     # detached HEAD state (c950fc05a540dd76b944719c2a3302da2e2f3090)
     await git_repo._run(
@@ -122,7 +114,6 @@ async def test_git_current_commit_detached(git_repo):
     assert p.stdout.decode().strip() == "c950fc05a540dd76b944719c2a3302da2e2f3090"
 
 
-@pytest.mark.asyncio
 async def test_git_latest_commit(git_repo):
     # HEAD on dont_add_commits (a0ccc2390883c85a361f5a90c72e1b07958939fa)
     p = await git_repo._run(
@@ -134,7 +125,6 @@ async def test_git_latest_commit(git_repo):
     assert p.stdout.decode().strip() == "a0ccc2390883c85a361f5a90c72e1b07958939fa"
 
 
-@pytest.mark.asyncio
 async def test_git_hard_reset(cloned_git_repo, tmp_path):
     staged_file = cloned_git_repo.folder_path / "staged_file.txt"
     staged_file.touch()
@@ -150,7 +140,6 @@ async def test_git_hard_reset(cloned_git_repo, tmp_path):
     assert staged_file.exists() is False
 
 
-@pytest.mark.asyncio
 async def test_git_pull(git_repo_with_remote, tmp_path):
     # setup
     staged_file = Path(git_repo_with_remote.url) / "staged_file.txt"
@@ -171,7 +160,6 @@ async def test_git_pull(git_repo_with_remote, tmp_path):
     assert (git_repo_with_remote.folder_path / "staged_file.txt").exists()
 
 
-@pytest.mark.asyncio
 async def test_git_diff_file_status(git_repo):
     p = await git_repo._run(
         ProcessFormatter().format(
@@ -195,7 +183,6 @@ async def test_git_diff_file_status(git_repo):
 # might need to add test for test_git_log, but it's unused method currently
 
 
-@pytest.mark.asyncio
 async def test_git_discover_remote_url(cloned_git_repo, tmp_path):
     p = await cloned_git_repo._run(
         ProcessFormatter().format(
@@ -206,7 +193,6 @@ async def test_git_discover_remote_url(cloned_git_repo, tmp_path):
     assert p.stdout.decode().strip() == cloned_git_repo.url
 
 
-@pytest.mark.asyncio
 async def test_git_checkout_detached_head(git_repo):
     p = await git_repo._run(
         ProcessFormatter().format(
@@ -218,7 +204,6 @@ async def test_git_checkout_detached_head(git_repo):
     assert p.returncode == 0
 
 
-@pytest.mark.asyncio
 async def test_git_checkout_branch(git_repo):
     p = await git_repo._run(
         ProcessFormatter().format(
@@ -228,7 +213,6 @@ async def test_git_checkout_branch(git_repo):
     assert p.returncode == 0
 
 
-@pytest.mark.asyncio
 async def test_git_checkout_non_existent_branch(git_repo):
     p = await git_repo._run(
         ProcessFormatter().format(
@@ -238,7 +222,6 @@ async def test_git_checkout_non_existent_branch(git_repo):
     assert p.returncode == 1
 
 
-@pytest.mark.asyncio
 async def test_git_get_full_sha1_from_branch_name(git_repo):
     p = await git_repo._run(
         ProcessFormatter().format(
@@ -249,7 +232,6 @@ async def test_git_get_full_sha1_from_branch_name(git_repo):
     assert p.stdout.decode().strip() == "a0ccc2390883c85a361f5a90c72e1b07958939fa"
 
 
-@pytest.mark.asyncio
 async def test_git_get_full_sha1_from_full_hash(git_repo):
     p = await git_repo._run(
         ProcessFormatter().format(
@@ -262,7 +244,6 @@ async def test_git_get_full_sha1_from_full_hash(git_repo):
     assert p.stdout.decode().strip() == "c950fc05a540dd76b944719c2a3302da2e2f3090"
 
 
-@pytest.mark.asyncio
 async def test_git_get_full_sha1_from_short_hash(git_repo):
     p = await git_repo._run(
         ProcessFormatter().format(
@@ -273,7 +254,6 @@ async def test_git_get_full_sha1_from_short_hash(git_repo):
     assert p.stdout.decode().strip() == "c950fc05a540dd76b944719c2a3302da2e2f3090"
 
 
-@pytest.mark.asyncio
 async def test_git_get_full_sha1_from_too_short_hash(git_repo):
     p = await git_repo._run(
         ProcessFormatter().format(git_repo.GIT_GET_FULL_SHA1, path=git_repo.folder_path, rev="c95")
@@ -282,7 +262,6 @@ async def test_git_get_full_sha1_from_too_short_hash(git_repo):
     assert p.stderr.decode().strip() == "fatal: Needed a single revision"
 
 
-@pytest.mark.asyncio
 async def test_git_get_full_sha1_from_lightweight_tag(git_repo):
     p = await git_repo._run(
         ProcessFormatter().format(
@@ -293,7 +272,6 @@ async def test_git_get_full_sha1_from_lightweight_tag(git_repo):
     assert p.stdout.decode().strip() == "fb99eb7d2d5bed514efc98fe6686b368f8425745"
 
 
-@pytest.mark.asyncio
 async def test_git_get_full_sha1_from_annotated_tag(git_repo):
     p = await git_repo._run(
         ProcessFormatter().format(
@@ -304,7 +282,6 @@ async def test_git_get_full_sha1_from_annotated_tag(git_repo):
     assert p.stdout.decode().strip() == "a7120330cc179396914e0d6af80cfa282adc124b"
 
 
-@pytest.mark.asyncio
 async def test_git_get_full_sha1_from_invalid_ref(git_repo):
     p = await git_repo._run(
         ProcessFormatter().format(
@@ -318,7 +295,6 @@ async def test_git_get_full_sha1_from_invalid_ref(git_repo):
 @pytest.mark.skipif(
     GIT_VERSION < (2, 31), reason="This is test for output from Git 2.31 and newer."
 )
-@pytest.mark.asyncio
 async def test_git_get_full_sha1_from_ambiguous_commits(git_repo):
     # 2 ambiguous refs:
     # branch ambiguous_1 - 95da0b576271cb5bee5f3e075074c03ee05fed05
@@ -341,7 +317,6 @@ async def test_git_get_full_sha1_from_ambiguous_commits(git_repo):
 @pytest.mark.skipif(
     GIT_VERSION < (2, 36), reason="This is test for output from Git 2.36 and newer."
 )
-@pytest.mark.asyncio
 async def test_git_get_full_sha1_from_ambiguous_tag_and_commit(git_repo):
     # 2 ambiguous refs:
     # branch ambiguous_with_tag - c6f0e5ec04d99bdf8c6c78ff20d66d286eecb3ea
@@ -364,7 +339,6 @@ async def test_git_get_full_sha1_from_ambiguous_tag_and_commit(git_repo):
 @pytest.mark.skipif(
     not ((2, 31) <= GIT_VERSION < (2, 36)), reason="This is test for output from Git >=2.31,<2.36."
 )
-@pytest.mark.asyncio
 async def test_git_get_full_sha1_from_ambiguous_tag_and_commit_pre_2_36(git_repo):
     # 2 ambiguous refs:
     # branch ambiguous_with_tag - c6f0e5ec04d99bdf8c6c78ff20d66d286eecb3ea
@@ -387,7 +361,6 @@ async def test_git_get_full_sha1_from_ambiguous_tag_and_commit_pre_2_36(git_repo
 @pytest.mark.skipif(
     GIT_VERSION >= (2, 31), reason="This is test for output from Git older than 2.31."
 )
-@pytest.mark.asyncio
 async def test_git_get_full_sha1_from_ambiguous_commits_pre_2_31(git_repo):
     # 2 ambiguous refs:
     # branch ambiguous_1 - 95da0b576271cb5bee5f3e075074c03ee05fed05
@@ -410,7 +383,6 @@ async def test_git_get_full_sha1_from_ambiguous_commits_pre_2_31(git_repo):
 @pytest.mark.skipif(
     GIT_VERSION >= (2, 31), reason="This is test for output from Git older than 2.31."
 )
-@pytest.mark.asyncio
 async def test_git_get_full_sha1_from_ambiguous_tag_and_commit_pre_2_31(git_repo):
     # 2 ambiguous refs:
     # branch ambiguous_with_tag - c6f0e5ec04d99bdf8c6c78ff20d66d286eecb3ea
@@ -430,7 +402,6 @@ async def test_git_get_full_sha1_from_ambiguous_tag_and_commit_pre_2_31(git_repo
     )
 
 
-@pytest.mark.asyncio
 async def test_git_is_ancestor_true(git_repo):
     p = await git_repo._run(
         ProcessFormatter().format(
@@ -443,7 +414,6 @@ async def test_git_is_ancestor_true(git_repo):
     assert p.returncode == 0
 
 
-@pytest.mark.asyncio
 async def test_git_is_ancestor_false(git_repo):
     p = await git_repo._run(
         ProcessFormatter().format(
@@ -456,7 +426,6 @@ async def test_git_is_ancestor_false(git_repo):
     assert p.returncode == 1
 
 
-@pytest.mark.asyncio
 async def test_git_is_ancestor_invalid_object(git_repo):
     p = await git_repo._run(
         ProcessFormatter().format(
@@ -470,7 +439,6 @@ async def test_git_is_ancestor_invalid_object(git_repo):
     assert p.stderr.decode().strip() == "fatal: Not a valid object name invalid1"
 
 
-@pytest.mark.asyncio
 async def test_git_is_ancestor_invalid_commit(git_repo):
     p = await git_repo._run(
         ProcessFormatter().format(
@@ -486,7 +454,6 @@ async def test_git_is_ancestor_invalid_commit(git_repo):
     )
 
 
-@pytest.mark.asyncio
 async def test_git_check_if_module_exists_true(git_repo):
     p = await git_repo._run(
         ProcessFormatter().format(
@@ -502,7 +469,6 @@ async def test_git_check_if_module_exists_true(git_repo):
 @pytest.mark.skipif(
     GIT_VERSION < (2, 36), reason="This is test for output from Git 2.36 and newer."
 )
-@pytest.mark.asyncio
 async def test_git_check_if_module_exists_false(git_repo):
     p = await git_repo._run(
         ProcessFormatter().format(
@@ -521,7 +487,6 @@ async def test_git_check_if_module_exists_false(git_repo):
 @pytest.mark.skipif(
     GIT_VERSION >= (2, 36), reason="This is test for output from Git older than 2.31."
 )
-@pytest.mark.asyncio
 async def test_git_check_if_module_exists_false_pre_2_36(git_repo):
     p = await git_repo._run(
         ProcessFormatter().format(
@@ -537,7 +502,6 @@ async def test_git_check_if_module_exists_false_pre_2_36(git_repo):
     )
 
 
-@pytest.mark.asyncio
 async def test_git_find_last_occurrence_existent(git_repo):
     p = await git_repo._run(
         ProcessFormatter().format(
@@ -552,7 +516,6 @@ async def test_git_find_last_occurrence_existent(git_repo):
     assert p.stdout.decode().strip() == "a7120330cc179396914e0d6af80cfa282adc124b"
 
 
-@pytest.mark.asyncio
 async def test_git_find_last_occurrence_non_existent(git_repo):
     p = await git_repo._run(
         ProcessFormatter().format(

tests/cogs/test_alias.py

@@ -7,12 +7,10 @@ def test_is_valid_alias_name(alias):
     assert alias.is_valid_alias_name("not valid name") is False
 
 
-@pytest.mark.asyncio
 async def test_empty_guild_aliases(alias, empty_guild):
     assert list(await alias._aliases.get_guild_aliases(empty_guild)) == []
 
 
-@pytest.mark.asyncio
 async def test_empty_global_aliases(alias):
     assert list(await alias._aliases.get_global_aliases()) == []
 
@@ -25,7 +23,6 @@ async def create_test_global_alias(alias, ctx):
     await alias._aliases.add_alias(ctx, "test_global", "ping", global_=True)
 
 
-@pytest.mark.asyncio
 async def test_add_guild_alias(alias, ctx):
     await create_test_guild_alias(alias, ctx)
 
@@ -33,7 +30,6 @@ async def test_add_guild_alias(alias, ctx):
     assert alias_obj.name == "test"
 
 
-@pytest.mark.asyncio
 async def test_delete_guild_alias(alias, ctx):
     await create_test_guild_alias(alias, ctx)
     alias_obj = await alias._aliases.get_alias(ctx.guild, "test")
@@ -46,7 +42,6 @@ async def test_delete_guild_alias(alias, ctx):
     assert alias_obj is None
 
 
-@pytest.mark.asyncio
 async def test_add_global_alias(alias, ctx):
     await create_test_global_alias(alias, ctx)
     alias_obj = await alias._aliases.get_alias(ctx.guild, "test_global")
@@ -54,7 +49,6 @@ async def test_add_global_alias(alias, ctx):
     assert alias_obj.name == "test_global"
 
 
-@pytest.mark.asyncio
 async def test_delete_global_alias(alias, ctx):
     await create_test_global_alias(alias, ctx)
     alias_obj = await alias._aliases.get_alias(ctx.guild, "test_global")

tests/cogs/test_economy.py

@@ -2,7 +2,6 @@ import pytest
 from redbot.pytest.economy import *
 
 
-@pytest.mark.asyncio
 async def test_bank_register(bank, ctx):
     default_bal = await bank.get_default_balance(ctx.guild)
     assert default_bal == (await bank.get_account(ctx.author)).balance
@@ -15,7 +14,6 @@ async def has_account(member, bank):
     await bank.set_balance(member, balance)
 
 
-@pytest.mark.asyncio
 async def test_bank_transfer(bank, member_factory):
     mbr1 = member_factory.get()
     mbr2 = member_factory.get()
@@ -28,7 +26,6 @@ async def test_bank_transfer(bank, member_factory):
     assert bal2 + 50 == newbal2
 
 
-@pytest.mark.asyncio
 async def test_bank_set(bank, member_factory):
     mbr = member_factory.get()
     await bank.set_balance(mbr, 250)
@@ -36,7 +33,6 @@ async def test_bank_set(bank, member_factory):
     assert acc.balance == 250
 
 
-@pytest.mark.asyncio
 async def test_bank_can_spend(bank, member_factory):
     mbr = member_factory.get()
     canspend = await bank.can_spend(mbr, 50)
@@ -47,7 +43,6 @@ async def test_bank_can_spend(bank, member_factory):
     assert canspendnow
 
 
-@pytest.mark.asyncio
 async def test_set_bank_name(bank, guild_factory):
     guild = guild_factory.get()
     await bank.set_bank_name("Test Bank", guild)
@@ -55,7 +50,6 @@ async def test_set_bank_name(bank, guild_factory):
     assert name == "Test Bank"
 
 
-@pytest.mark.asyncio
 async def test_set_currency_name(bank, guild_factory):
     guild = guild_factory.get()
     await bank.set_currency_name("Coins", guild)
@@ -63,7 +57,6 @@ async def test_set_currency_name(bank, guild_factory):
     assert name == "Coins"
 
 
-@pytest.mark.asyncio
 async def test_set_default_balance(bank, guild_factory):
     guild = guild_factory.get()
     await bank.set_default_balance(500, guild)
@@ -71,7 +64,6 @@ async def test_set_default_balance(bank, guild_factory):
     assert default_bal == 500
 
 
-@pytest.mark.asyncio
 async def test_nonint_transaction_amount(bank, member_factory):
     mbr1 = member_factory.get()
     mbr2 = member_factory.get()

tests/cogs/test_mod.py

@@ -3,14 +3,12 @@ import pytest
 from redbot.pytest.mod import *
 
 
-@pytest.mark.asyncio
 async def test_modlog_register_casetype(mod):
     ct = {"name": "ban", "default_setting": True, "image": ":hammer:", "case_str": "Ban"}
     casetype = await mod.register_casetype(**ct)
     assert casetype is not None
 
 
-@pytest.mark.asyncio
 async def test_modlog_case_create(mod, ctx, member_factory):
     from datetime import datetime, timezone
 
@@ -33,7 +31,6 @@ async def test_modlog_case_create(mod, ctx, member_factory):
     assert case.created_at == int(created_at.timestamp())
 
 
-@pytest.mark.asyncio
 async def test_modlog_set_modlog_channel(mod, ctx):
     await mod.set_modlog_channel(ctx.guild, ctx.channel)
     assert await mod.get_modlog_channel(ctx.guild) == ctx.channel.id

tests/core/test_cog_manager.py

@@ -7,20 +7,17 @@ from redbot.core import cog_manager
 
 
 @pytest.mark.skip
-@pytest.mark.asyncio
 async def test_ensure_cogs_in_paths(cog_mgr, default_dir):
     cogs_dir = default_dir / "redbot" / "cogs"
     assert cogs_dir in await cog_mgr.paths()
 
 
-@pytest.mark.asyncio
 async def test_install_path_set(cog_mgr: cog_manager.CogManager, tmpdir):
     path = Path(str(tmpdir))
     await cog_mgr.set_install_path(path)
     assert await cog_mgr.install_path() == path
 
 
-@pytest.mark.asyncio
 async def test_install_path_set_bad(cog_mgr):
     path = Path("something")
 
@@ -28,14 +25,12 @@ async def test_install_path_set_bad(cog_mgr):
         await cog_mgr.set_install_path(path)
 
 
-@pytest.mark.asyncio
 async def test_add_path(cog_mgr, tmpdir):
     path = Path(str(tmpdir))
     await cog_mgr.add_path(path)
     assert path in await cog_mgr.paths()
 
 
-@pytest.mark.asyncio
 async def test_add_path_already_install_path(cog_mgr, tmpdir):
     path = Path(str(tmpdir))
     await cog_mgr.set_install_path(path)
@@ -43,7 +38,6 @@ async def test_add_path_already_install_path(cog_mgr, tmpdir):
         await cog_mgr.add_path(path)
 
 
-@pytest.mark.asyncio
 async def test_remove_path(cog_mgr, tmpdir):
     path = Path(str(tmpdir))
     await cog_mgr.add_path(path)

tests/core/test_config.py

@@ -5,7 +5,6 @@ from collections import Counter
 
 
 # region Register Tests
-@pytest.mark.asyncio
 async def test_config_register_global(config):
     config.register_global(enabled=False)
     assert config.defaults["GLOBAL"]["enabled"] is False
@@ -17,7 +16,6 @@ def test_config_register_global_badvalues(config):
         config.register_global(**{"invalid var name": True})
 
 
-@pytest.mark.asyncio
 async def test_config_register_guild(config, empty_guild):
     config.register_guild(enabled=False, some_list=[], some_dict={})
     assert config.defaults[config.GUILD]["enabled"] is False
@@ -29,35 +27,30 @@ async def test_config_register_guild(config, empty_guild):
     assert await config.guild(empty_guild).some_dict() == {}
 
 
-@pytest.mark.asyncio
 async def test_config_register_channel(config, empty_channel):
     config.register_channel(enabled=False)
     assert config.defaults[config.CHANNEL]["enabled"] is False
     assert await config.channel(empty_channel).enabled() is False
 
 
-@pytest.mark.asyncio
 async def test_config_register_role(config, empty_role):
     config.register_role(enabled=False)
     assert config.defaults[config.ROLE]["enabled"] is False
     assert await config.role(empty_role).enabled() is False
 
 
-@pytest.mark.asyncio
 async def test_config_register_member(config, empty_member):
     config.register_member(some_number=-1)
     assert config.defaults[config.MEMBER]["some_number"] == -1
     assert await config.member(empty_member).some_number() == -1
 
 
-@pytest.mark.asyncio
 async def test_config_register_user(config, empty_user):
     config.register_user(some_value=None)
     assert config.defaults[config.USER]["some_value"] is None
     assert await config.user(empty_user).some_value() is None
 
 
-@pytest.mark.asyncio
 async def test_config_force_register_global(config_fr):
     with pytest.raises(AttributeError):
         await config_fr.enabled()
@@ -70,13 +63,11 @@ async def test_config_force_register_global(config_fr):
 
 
 # Test nested registration
-@pytest.mark.asyncio
 async def test_nested_registration(config):
     config.register_global(foo__bar__baz=False)
     assert await config.foo.bar.baz() is False
 
 
-@pytest.mark.asyncio
 async def test_nested_registration_asdict(config):
     defaults = {"bar": {"baz": False}}
     config.register_global(foo=defaults)
@@ -84,7 +75,6 @@ async def test_nested_registration_asdict(config):
     assert await config.foo.bar.baz() is False
 
 
-@pytest.mark.asyncio
 async def test_nested_registration_and_changing(config):
     defaults = {"bar": {"baz": False}}
     config.register_global(foo=defaults)
@@ -95,7 +85,6 @@ async def test_nested_registration_and_changing(config):
         await config.foo.set(True)
 
 
-@pytest.mark.asyncio
 async def test_doubleset_default(config):
     config.register_global(foo=True)
     config.register_global(foo=False)
@@ -103,7 +92,6 @@ async def test_doubleset_default(config):
     assert await config.foo() is False
 
 
-@pytest.mark.asyncio
 async def test_nested_registration_multidict(config):
     defaults = {"foo": {"bar": {"baz": True}}, "blah": True}
     config.register_global(**defaults)
@@ -118,7 +106,6 @@ def test_nested_group_value_badreg(config):
         config.register_global(foo__bar=False)
 
 
-@pytest.mark.asyncio
 async def test_nested_toplevel_reg(config):
     defaults = {"bar": True, "baz": False}
     config.register_global(foo=defaults)
@@ -127,7 +114,6 @@ async def test_nested_toplevel_reg(config):
     assert await config.foo.baz() is False
 
 
-@pytest.mark.asyncio
 async def test_nested_overlapping(config):
     config.register_global(foo__bar=True)
     config.register_global(foo__baz=False)
@@ -136,7 +122,6 @@ async def test_nested_overlapping(config):
     assert await config.foo.baz() is False
 
 
-@pytest.mark.asyncio
 async def test_nesting_nofr(config):
     config.register_global(foo={})
     assert await config.foo.bar() is None
@@ -144,38 +129,31 @@ async def test_nesting_nofr(config):
 
 
 # region Default Value Overrides
-@pytest.mark.asyncio
 async def test_global_default_override(config):
     assert await config.enabled(True) is True
 
 
-@pytest.mark.asyncio
 async def test_global_default_nofr(config):
     assert await config.nofr() is None
     assert await config.nofr(True) is True
 
 
-@pytest.mark.asyncio
 async def test_guild_default_override(config, empty_guild):
     assert await config.guild(empty_guild).enabled(True) is True
 
 
-@pytest.mark.asyncio
 async def test_channel_default_override(config, empty_channel):
     assert await config.channel(empty_channel).enabled(True) is True
 
 
-@pytest.mark.asyncio
 async def test_role_default_override(config, empty_role):
     assert await config.role(empty_role).enabled(True) is True
 
 
-@pytest.mark.asyncio
 async def test_member_default_override(config, empty_member):
     assert await config.member(empty_member).enabled(True) is True
 
 
-@pytest.mark.asyncio
 async def test_user_default_override(config, empty_user):
     assert await config.user(empty_user).some_value(True) is True
 
@@ -184,13 +162,11 @@ async def test_user_default_override(config, empty_user):
 
 
 # region Setting Values
-@pytest.mark.asyncio
 async def test_set_global(config):
     await config.enabled.set(True)
     assert await config.enabled() is True
 
 
-@pytest.mark.asyncio
 async def test_set_guild(config, empty_guild):
     await config.guild(empty_guild).enabled.set(True)
     assert await config.guild(empty_guild).enabled() is True
@@ -203,13 +179,11 @@ async def test_set_guild(config, empty_guild):
     assert await config.guild(empty_guild).some_list() == curr_list
 
 
-@pytest.mark.asyncio
 async def test_set_channel(config, empty_channel):
     await config.channel(empty_channel).enabled.set(True)
     assert await config.channel(empty_channel).enabled() is True
 
 
-@pytest.mark.asyncio
 async def test_set_channel_no_register(config, empty_channel):
     await config.channel(empty_channel).no_register.set(True)
     assert await config.channel(empty_channel).no_register() is True
@@ -219,14 +193,12 @@ async def test_set_channel_no_register(config, empty_channel):
 
 
 # Dynamic attribute testing
-@pytest.mark.asyncio
 async def test_set_dynamic_attr(config):
     await config.set_raw("foobar", value=True)
 
     assert await config.foobar() is True
 
 
-@pytest.mark.asyncio
 async def test_clear_dynamic_attr(config):
     await config.foo.set(True)
     await config.clear_raw("foo")
@@ -235,13 +207,11 @@ async def test_clear_dynamic_attr(config):
         await config.get_raw("foo")
 
 
-@pytest.mark.asyncio
 async def test_get_dynamic_attr(config):
     assert await config.get_raw("foobaz", default=True) is True
 
 
 # Member Group testing
-@pytest.mark.asyncio
 async def test_membergroup_allguilds(config, empty_member):
     await config.member(empty_member).foo.set(False)
 
@@ -249,7 +219,6 @@ async def test_membergroup_allguilds(config, empty_member):
     assert empty_member.guild.id in all_servers
 
 
-@pytest.mark.asyncio
 async def test_membergroup_allmembers(config, empty_member):
     await config.member(empty_member).foo.set(False)
 
@@ -258,7 +227,6 @@ async def test_membergroup_allmembers(config, empty_member):
 
 
 # Clearing testing
-@pytest.mark.asyncio
 async def test_global_clear(config):
     config.register_global(foo=True, bar=False)
 
@@ -274,7 +242,6 @@ async def test_global_clear(config):
     assert await config.bar() is False
 
 
-@pytest.mark.asyncio
 async def test_member_clear(config, member_factory):
     config.register_member(foo=True)
 
@@ -293,7 +260,6 @@ async def test_member_clear(config, member_factory):
     assert await config.member(m2).foo() is False
 
 
-@pytest.mark.asyncio
 async def test_member_clear_all(config, member_factory):
     server_ids = []
     for _ in range(5):
@@ -309,7 +275,6 @@ async def test_member_clear_all(config, member_factory):
     assert len(await config.all_members()) == 0
 
 
-@pytest.mark.asyncio
 async def test_clear_all(config):
     await config.foo.set(True)
     assert await config.foo() is True
@@ -319,7 +284,6 @@ async def test_clear_all(config):
         await config.get_raw("foo")
 
 
-@pytest.mark.asyncio
 async def test_clear_value(config):
     await config.foo.set(True)
     await config.foo.clear()
@@ -329,7 +293,6 @@ async def test_clear_value(config):
 
 
 # Get All testing
-@pytest.mark.asyncio
 async def test_user_get_all_from_kind(config, user_factory):
     config.register_user(foo=False, bar=True)
     for _ in range(5):
@@ -345,7 +308,6 @@ async def test_user_get_all_from_kind(config, user_factory):
         assert v["bar"] is True
 
 
-@pytest.mark.asyncio
 async def test_user_getalldata(config, user_factory):
     user = user_factory.get()
     config.register_user(foo=True, bar=False)
@@ -359,7 +321,6 @@ async def test_user_getalldata(config, user_factory):
     assert config.user(user).defaults["foo"] is True
 
 
-@pytest.mark.asyncio
 async def test_value_ctxmgr(config):
     config.register_global(foo_list=[])
 
@@ -371,7 +332,6 @@ async def test_value_ctxmgr(config):
     assert "foo" in foo_list
 
 
-@pytest.mark.asyncio
 async def test_value_ctxmgr_saves(config):
     config.register_global(bar_list=[])
 
@@ -387,7 +347,6 @@ async def test_value_ctxmgr_saves(config):
     assert "bar" in bar_list
 
 
-@pytest.mark.asyncio
 async def test_value_ctxmgr_immutable(config):
     config.register_global(foo=True)
 
@@ -399,7 +358,6 @@ async def test_value_ctxmgr_immutable(config):
     assert foo is True
 
 
-@pytest.mark.asyncio
 async def test_ctxmgr_no_shared_default(config, member_factory):
     config.register_member(foo=[])
     m1 = member_factory.get()
@@ -411,7 +369,6 @@ async def test_ctxmgr_no_shared_default(config, member_factory):
     assert 1 not in await config.member(m2).foo()
 
 
-@pytest.mark.asyncio
 async def test_ctxmgr_no_unnecessary_write(config):
     config.register_global(foo=[])
     foo_value_obj = config.foo
@@ -421,7 +378,6 @@ async def test_ctxmgr_no_unnecessary_write(config):
         set_method.assert_not_called()
 
 
-@pytest.mark.asyncio
 async def test_get_then_mutate(config):
     """Tests that mutating an object after getting it as a value doesn't mutate the data store."""
     config.register_global(list1=[])
@@ -432,7 +388,6 @@ async def test_get_then_mutate(config):
     assert "foo" not in list1
 
 
-@pytest.mark.asyncio
 async def test_set_then_mutate(config):
     """Tests that mutating an object after setting it as a value doesn't mutate the data store."""
     config.register_global(list1=[])
@@ -443,14 +398,12 @@ async def test_set_then_mutate(config):
     assert "foo" not in list1
 
 
-@pytest.mark.asyncio
 async def test_call_group_fills_defaults(config):
     config.register_global(subgroup={"foo": True})
     subgroup = await config.subgroup()
     assert "foo" in subgroup
 
 
-@pytest.mark.asyncio
 async def test_group_call_ctxmgr_writes(config):
     config.register_global(subgroup={"foo": True})
     async with config.subgroup() as subgroup:
@@ -460,7 +413,6 @@ async def test_group_call_ctxmgr_writes(config):
     assert subgroup == {"foo": True, "bar": False}
 
 
-@pytest.mark.asyncio
 async def test_all_works_as_ctxmgr(config):
     config.register_global(subgroup={"foo": True})
     async with config.subgroup.all() as subgroup:
@@ -470,7 +422,6 @@ async def test_all_works_as_ctxmgr(config):
     assert subgroup == {"foo": True, "bar": False}
 
 
-@pytest.mark.asyncio
 async def test_get_raw_mixes_defaults(config):
     config.register_global(subgroup={"foo": True})
     await config.subgroup.set_raw("bar", value=False)
@@ -479,7 +430,6 @@ async def test_get_raw_mixes_defaults(config):
     assert subgroup == {"foo": True, "bar": False}
 
 
-@pytest.mark.asyncio
 async def test_cast_str_raw(config):
     await config.set_raw(123, 456, value=True)
     assert await config.get_raw(123, 456) is True
@@ -487,7 +437,6 @@ async def test_cast_str_raw(config):
     await config.clear_raw("123", 456)
 
 
-@pytest.mark.asyncio
 async def test_cast_str_nested(config):
     config.register_global(foo={})
     await config.foo.set({123: True, 456: {789: False}})
@@ -510,7 +459,6 @@ def test_config_custom_doubleinit(config):
         config.init_custom("TEST", 2)
 
 
-@pytest.mark.asyncio
 async def test_config_locks_cache(config, empty_guild):
     lock1 = config.foo.get_lock()
     assert lock1 is config.foo.get_lock()
@@ -519,7 +467,6 @@ async def test_config_locks_cache(config, empty_guild):
     assert lock1 is not lock2
 
 
-@pytest.mark.asyncio
 async def test_config_value_atomicity(config):
     config.register_global(foo=[])
     tasks = []
@@ -539,7 +486,6 @@ async def test_config_value_atomicity(config):
     assert len(await config.foo()) == 15
 
 
-@pytest.mark.asyncio
 async def test_config_ctxmgr_atomicity(config):
     config.register_global(foo=[])
     tasks = []
@@ -557,7 +503,6 @@ async def test_config_ctxmgr_atomicity(config):
     assert len(await config.foo()) == 15
 
 
-@pytest.mark.asyncio
 async def test_set_with_partial_primary_keys(config):
     config.init_custom("CUSTOM", 3)
     await config.custom("CUSTOM", "1").set({"11": {"111": {"foo": "bar"}}})
@@ -585,7 +530,6 @@ async def test_set_with_partial_primary_keys(config):
     assert await config.custom("CUSTOM", "2", "33", "222").foo() == "biz"
 
 
-@pytest.mark.asyncio
 async def test_raw_with_partial_primary_keys(config):
     config.init_custom("CUSTOM", 1)
     await config.custom("CUSTOM").set_raw("primary_key", "identifier", value=True)
@@ -654,7 +598,6 @@ PARAMS = [
 
 
 @pytest.mark.parametrize("pkeys, raw_args, result", PARAMS)
-@pytest.mark.asyncio
 async def test_config_custom_partial_pkeys_get(config, pkeys, raw_args, result):
     # setup
     config.init_custom("TEST", 3)
@@ -666,7 +609,6 @@ async def test_config_custom_partial_pkeys_get(config, pkeys, raw_args, result):
 
 
 @pytest.mark.parametrize("pkeys, raw_args, result", PARAMS)
-@pytest.mark.asyncio
 async def test_config_custom_partial_pkeys_set(config, pkeys, raw_args, result):
     # setup
     config.init_custom("TEST", 3)

tests/core/test_installation.py

@@ -1,6 +1,5 @@
 import pytest
 
 
-@pytest.mark.asyncio
 async def test_can_init_bot(red):
     assert red is not None

tests/core/test_utils.py

@@ -15,7 +15,6 @@ def test_deduplicate_iterables():
     assert deduplicate_iterables(*inputs) == expected
 
 
-@pytest.mark.asyncio
 async def test_bounded_gather():
     status = [0, 0]  # num_running, max_running
 
@@ -52,7 +51,6 @@ async def test_bounded_gather():
     assert num_fail == num_failed
 
 
-@pytest.mark.asyncio
 async def test_bounded_gather_iter():
     status = [0, 0]  # num_running, max_running
 
@@ -91,7 +89,6 @@ async def test_bounded_gather_iter():
 
 
 @pytest.mark.skip(reason="spams logs with pending task warnings")
-@pytest.mark.asyncio
 async def test_bounded_gather_iter_cancel():
     status = [0, 0, 0]  # num_running, max_running, num_ran
 

tests/core/test_version.py

@@ -73,7 +73,7 @@ def test_python_version_has_lower_bound():
 
 
 @pytest.mark.skipif(
-    os.getenv("TOX_RED", False) and sys.version_info >= (3, 10),
+    os.getenv("TOX_RED", False) and sys.version_info >= (3, 12),
     reason="Testing on yet to be supported Python version.",
 )
 def test_python_version_has_upper_bound():