Skip to content

Commit 3b9e98a

Browse files
authored
Merge branch 'master' into black
2 parents fa5433b + 1fdad68 commit 3b9e98a

3 files changed

Lines changed: 8 additions & 7 deletions

File tree

src/hyperlink/_url.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ def _textcheck(name, value, delims=frozenset(), nullable=False):
467467
if not isinstance(value, Text):
468468
if nullable and value is None:
469469
# used by query string values
470-
return value # type: ignore[misc] # unreachable
470+
return value # type: ignore[unreachable]
471471
else:
472472
str_name = "unicode" if PY2 else "str"
473473
exp = str_name + ' or NoneType' if nullable else str_name

src/hyperlink/test/test_common.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ def test_assertRaisesContextManager(self):
8888
with self.hyperlink_test.assertRaises(_ExpectedException) as cm:
8989
raise _ExpectedException
9090

91-
self.assertTrue( # type: ignore[misc] # unreachable
91+
self.assertTrue( # type: ignore[unreachable]
9292
isinstance(cm.exception, _ExpectedException)
9393
)
9494

tox.ini

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ basepython =
4141
pypy3: pypy3
4242

4343
deps =
44-
test: idna==2.8
44+
test: coverage==4.5.4 # rq.filter: <5
45+
test: idna==2.9
4546
test: typing==3.7.4.1
4647
test: {py26,py27,py34}: pytest==4.6.9
4748
test: {py35,py36,py37,py38}: pytest==5.2.4
@@ -171,7 +172,7 @@ description = run Mypy (static type checker)
171172
basepython = {[default]basepython}
172173

173174
deps =
174-
mypy==0.761
175+
mypy==0.770
175176

176177
commands =
177178
mypy \
@@ -254,7 +255,7 @@ skip_install = True
254255
deps =
255256
{[testenv:coverage_report]deps}
256257

257-
codecov==2.0.15
258+
codecov==2.0.21
258259

259260
passenv =
260261
# See https://github.com/codecov/codecov-python/blob/master/README.md#using-tox
@@ -338,8 +339,8 @@ basepython = {[default]basepython}
338339
skip_install = True
339340

340341
deps =
341-
check-manifest==0.40
342-
readme_renderer==24.0
342+
check-manifest==0.41
343+
readme-renderer==25.0
343344
twine==3.1.1
344345

345346
commands =

0 commit comments

Comments
 (0)