Bump pytest to version 6.0.1 and yarl to 1.5.1 (#4126)

* Update pytest to version 6.0.1

* remove some awful monkeypatching

* use new import mode

* Update yarl to 1.5.1
This commit is contained in:
jack1142 2020-08-01 16:40:19 +02:00 committed by GitHub
parent 3b5183de43
commit 36f1fa15a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 21 deletions

View File

@ -17,3 +17,7 @@
| redbot\/vendored | redbot\/vendored
)/ )/
''' '''
[tool.pytest.ini_options]
minversion = "6.0"
addopts = "--import-mode=importlib"

View File

@ -4,13 +4,11 @@ from pathlib import Path
import weakref import weakref
import pytest import pytest
from _pytest.monkeypatch import MonkeyPatch
from redbot.core import Config from redbot.core import Config
from redbot.core.bot import Red from redbot.core.bot import Red
from redbot.core import config as config_module, drivers from redbot.core import config as config_module, drivers
__all__ = [ __all__ = [
"monkeysession",
"override_data_path", "override_data_path",
"coroutine", "coroutine",
"driver", "driver",
@ -30,13 +28,6 @@ __all__ = [
] ]
@pytest.fixture(scope="session")
def monkeysession(request):
mpatch = MonkeyPatch()
yield mpatch
mpatch.undo()
@pytest.fixture(autouse=True) @pytest.fixture(autouse=True)
def override_data_path(tmpdir): def override_data_path(tmpdir):
from redbot.core import data_manager from redbot.core import data_manager

View File

@ -10,7 +10,6 @@ from redbot.cogs.downloader.repo_manager import RepoManager, Repo, ProcessFormat
from redbot.cogs.downloader.installable import Installable, InstalledModule from redbot.cogs.downloader.installable import Installable, InstalledModule
__all__ = [ __all__ = [
"patch_relative_to",
"repo_manager", "repo_manager",
"repo", "repo",
"bot_repo", "bot_repo",
@ -38,14 +37,6 @@ async def fake_current_commit(*args, **kwargs):
return "fake_result" return "fake_result"
@pytest.fixture(scope="module", autouse=True)
def patch_relative_to(monkeysession):
def fake_relative_to(self, some_path: Path):
return self
monkeysession.setattr("pathlib.Path.relative_to", fake_relative_to)
@pytest.fixture @pytest.fixture
def repo_manager(tmpdir_factory): def repo_manager(tmpdir_factory):
rm = RepoManager() rm = RepoManager()

View File

@ -58,7 +58,7 @@ install_requires =
typing-extensions==3.7.4.2 typing-extensions==3.7.4.2
uvloop==0.14.0; sys_platform != "win32" and platform_python_implementation == "CPython" uvloop==0.14.0; sys_platform != "win32" and platform_python_implementation == "CPython"
websockets==8.1 websockets==8.1
yarl==1.5.0 yarl==1.5.1
[options.extras_require] [options.extras_require]
docs = docs =
@ -94,6 +94,7 @@ style =
typed-ast==1.4.1 typed-ast==1.4.1
test = test =
astroid==2.4.2 astroid==2.4.2
iniconfig==1.0.1
isort==4.3.21 isort==4.3.21
lazy-object-proxy==1.4.3 lazy-object-proxy==1.4.3
mccabe==0.6.1 mccabe==0.6.1
@ -103,12 +104,11 @@ test =
py==1.9.0 py==1.9.0
pylint==2.5.3 pylint==2.5.3
pyparsing==2.4.7 pyparsing==2.4.7
pytest==5.4.3 pytest==6.0.1
pytest-asyncio==0.14.0 pytest-asyncio==0.14.0
pytest-mock==3.2.0 pytest-mock==3.2.0
six==1.15.0 six==1.15.0
toml==0.10.1 toml==0.10.1
wcwidth==0.2.5
wrapt==1.12.1 wrapt==1.12.1
[options.entry_points] [options.entry_points]