Skip to content

Commit 453b13e

Browse files
authored
Merge pull request #535 from twm/tx19.10.0
Deal with deprecation warnings
2 parents 1d8b992 + cdaa5fb commit 453b13e

2 files changed

Lines changed: 9 additions & 3 deletions

File tree

tox.ini

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ minversion = 2.5.0
66
usedevelop = true
77
deps =
88
; The tests currently require a treq with https://github.com/twisted/treq/pull/225
9-
test: https://github.com/twisted/treq/archive/0041d5d78a1b69a58b0f59c752d38be0335fe98e.zip
9+
test: https://github.com/twisted/treq/archive/2d28bf57c8695657ca04bc8c36924f17fcd286f4.zip
1010
test: pytest == 4.6.2
1111
test: pytest-twisted == 1.10
1212
test: pytest-django == 3.5.0
@@ -17,7 +17,6 @@ deps =
1717
setenv =
1818
YARRHARR_CONF={env:YARRHARR_CONF:{toxinidir}/yarrharr/tests/dev.ini}
1919
DJANGO_SETTINGS_MODULE=yarrharr.settings
20-
PYTHONWARNINGS=all,ignore::ImportWarning,ignore::DeprecationWarning:site
2120
PYTHONDONTWRITEBYTECODE=yes
2221
; This must remain disabled due to https://github.com/twisted/treq/issues/226
2322
; POISON_REACTOR=yes
@@ -59,3 +58,10 @@ use_parentheses = true
5958
line_length = 88
6059
skip = wsgi.py
6160
skip_glob = migrations/*.py
61+
62+
[pytest]
63+
filterwarnings=
64+
all
65+
ignore::ImportWarning
66+
# This is a Twisted bug, see https://twistedmatrix.com/trac/ticket/8227 and https://twistedmatrix.com/trac/ticket/8929
67+
ignore:Using readBody with a transport that does not have an abortConnection method:DeprecationWarning

yarrharr/templatetags/static_glob.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
_static_dir = os.path.join(os.path.dirname(__file__), '../static')
4040

4141

42-
@attr.s(cmp=False)
42+
@attr.s(eq=False)
4343
class NoStaticMatch(Exception):
4444
pattern = attr.ib()
4545

0 commit comments

Comments
 (0)