From 3496a473c73156fb02edf7dd8a1b1617a76a1b60 Mon Sep 17 00:00:00 2001 From: Eric Jolibois Date: Thu, 17 Dec 2020 23:28:07 +0100 Subject: [PATCH] build(deps): bump to pytest 6.2.1, pytest-mock 3.4.0, mkdocs-material 6.1.7 and codecov-action v1.0.15 (#2201) * build(deps): bump to pytest 6.2.1, pytest-mock 3.4.0, mkdocs-material 6.1.7 and codecov-action v1.0.15 replaces #2199, #2180 and #2164 * fix: yield_fixture is deprecated * chore: add dotenv in optional deps --- .github/workflows/ci.yml | 8 ++++---- docs/requirements.txt | 2 +- pydantic/version.py | 2 +- tests/conftest.py | 2 +- tests/requirements-testing.txt | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b9630e8296..81288f4524 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,7 +72,7 @@ jobs: run: make test - run: coverage xml - - uses: codecov/codecov-action@v1.0.14 + - uses: codecov/codecov-action@v1.0.15 with: file: ./coverage.xml env_vars: COMPILED,DEPS,PYTHON,OS @@ -87,7 +87,7 @@ jobs: run: make test - run: coverage xml - - uses: codecov/codecov-action@v1.0.14 + - uses: codecov/codecov-action@v1.0.15 with: file: ./coverage.xml env_vars: COMPILED,DEPS,PYTHON,OS @@ -105,7 +105,7 @@ jobs: run: make test - run: coverage xml - - uses: codecov/codecov-action@v1.0.14 + - uses: codecov/codecov-action@v1.0.15 with: file: ./coverage.xml env_vars: COMPILED,DEPS,PYTHON,OS @@ -143,7 +143,7 @@ jobs: - run: coverage xml - - uses: codecov/codecov-action@v1.0.14 + - uses: codecov/codecov-action@v1.0.15 with: file: ./coverage.xml env_vars: COMPILED,DEPS,PYTHON,OS diff --git a/docs/requirements.txt b/docs/requirements.txt index 70bc1d5f71..49078122f1 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -3,7 +3,7 @@ flake8==3.8.4 flake8-quotes==3.2.0 mkdocs==1.1.2 mkdocs-exclude==1.0.2 -mkdocs-material==6.1.6 +mkdocs-material==6.1.7 markdown-include==0.6.0 sqlalchemy orjson diff --git a/pydantic/version.py b/pydantic/version.py index cd81ee5f2b..4ba6f2dfbc 100644 --- a/pydantic/version.py +++ b/pydantic/version.py @@ -12,7 +12,7 @@ def version_info() -> str: from .main import compiled optional_deps = [] - for p in ('typing-extensions', 'email-validator', 'devtools'): + for p in ('devtools', 'dotenv', 'email-validator', 'typing-extensions'): try: import_module(p.replace('-', '_')) except ImportError: diff --git a/tests/conftest.py b/tests/conftest.py index 6cde3411b3..0d1c6c434d 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -46,7 +46,7 @@ def clear(self): os.environ.pop(n) -@pytest.yield_fixture +@pytest.fixture def env(): setenv = SetEnv() diff --git a/tests/requirements-testing.txt b/tests/requirements-testing.txt index 1a6b794014..bb600754b5 100644 --- a/tests/requirements-testing.txt +++ b/tests/requirements-testing.txt @@ -2,7 +2,7 @@ coverage==5.3 # pin importlib-metadata as upper versions need typing-extensions to work if on python < 3.8 importlib-metadata==3.1.0;python_version<"3.8" mypy==0.790 -pytest==6.1.2 +pytest==6.2.1 pytest-cov==2.10.1 -pytest-mock==3.3.1 +pytest-mock==3.4.0 pytest-sugar==0.9.4