Skip to content

Commit

Permalink
build(deps): bump to pytest 6.2.1, pytest-mock 3.4.0, mkdocs-material…
Browse files Browse the repository at this point in the history
… 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
  • Loading branch information
PrettyWood committed Dec 17, 2020
1 parent 09a5e28 commit 3496a47
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/requirements.txt
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pydantic/version.py
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion tests/conftest.py
Expand Up @@ -46,7 +46,7 @@ def clear(self):
os.environ.pop(n)


@pytest.yield_fixture
@pytest.fixture
def env():
setenv = SetEnv()

Expand Down
4 changes: 2 additions & 2 deletions tests/requirements-testing.txt
Expand Up @@ -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

0 comments on commit 3496a47

Please sign in to comment.