Skip to content

Commit 24c7664

Browse files
committed
Merge remote-tracking branch 'origin/master' into bump-python-and-mypy
2 parents 297ef25 + 28e2767 commit 24c7664

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

dev-requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ flake8-quotes==3.2.0 # Require single quotes
1313
flake8==3.8.4 # Lint
1414
freezegun==1.1.0 # Freeze time in tests
1515
isort==5.7.0 # Lint imports
16-
keyring==21.8.0
16+
keyring==22.0.1
1717
mypy==0.800 # Type checking
1818
pip_check_reqs==2.1.1
1919
pydocstyle==5.1.1 # Lint docstrings
@@ -23,7 +23,7 @@ pylint==2.6.0 # Lint
2323
pyroma==2.6 # Packaging best practices checker
2424
pytest-cov==2.11.1 # Measure code coverage
2525
pytest-envfiles==0.1.0 # Use files for environment variables for tests
26-
pytest==6.2.1 # Test runners
26+
pytest==6.2.2 # Test runners
2727
requests-mock-flask==2020.9.25.0
2828
sphinx-autodoc-typehints==1.11.1
2929
sphinx_paramlinks==0.4.3

src/mock_vws/_flask_server/vwq.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ class ResponseNoContentTypeAdded(Response):
6969
Without this, a content type is added to all responses.
7070
Some of our responses need to not have a "Content-Type" header.
7171
"""
72-
7372
default_mimetype = None
7473

7574

src/mock_vws/_flask_server/vws.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ class ResponseNoContentTypeAdded(Response):
5252
Without this, a content type is added to all responses.
5353
Some of our responses need to not have a "Content-Type" header.
5454
"""
55-
5655
default_mimetype = None
5756

5857

0 commit comments

Comments
 (0)