1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
|
From: Steve Kowalik <steven@wedontsleep.org>
Date: Mon, 19 Aug 2024 15:39:25 +1000
Subject: Do not use warns(None) to check for no warnings
warns(None) is an anti-pattern, and is explicitly forbidden starting
from pytest 8.0. Instead, we catch all warnings, and filter them to be
errors, so they will raise an (uncaught) exception. Drive-by importing
warns from pytest rather than the internal name.
Origin: upstream, https://github.com/mverleg/pyjson_tricks/pull/102
Last-Update: 2025-02-20
---
tests/test_bare.py | 24 ++++++++++--------------
tests/test_np.py | 8 ++++----
2 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/tests/test_bare.py b/tests/test_bare.py
index d8ca447..a3c67c9 100644
--- a/tests/test_bare.py
+++ b/tests/test_bare.py
@@ -10,10 +10,10 @@ from io import BytesIO, StringIO
from math import pi, exp
from os.path import join
from tempfile import mkdtemp
+from warnings import catch_warnings, simplefilter
import pytest
-from _pytest.recwarn import warns
-from pytest import raises, fail
+from pytest import raises, fail, warns
from json_tricks import fallback_ignore_unknown, DuplicateJsonKeyException
from json_tricks.nonp import strip_comments, dump, dumps, load, loads, \
@@ -168,33 +168,29 @@ def test_ignore_comments_deprecation():
loads(test_json_with_comments)
# Second time there should be no warning
- # noinspection PyTypeChecker
- with warns(None) as captured:
+ with catch_warnings():
+ simplefilter("error")
loaded = loads(test_json_with_comments)
- assert len(captured) == 0
assert loaded == test_object_for_comment_strings
# Passing a string without comments should not have a warning
loads._ignore_comments_warned_ = False
- # noinspection PyTypeChecker
- with warns(None) as captured:
+ with catch_warnings():
+ simplefilter("error")
loaded = loads(test_json_without_comments)
- assert len(captured) == 0
# Passing True for argument explicitly should not have a warning
loads._ignore_comments_warned_ = False
- # noinspection PyTypeChecker
- with warns(None) as captured:
+ with catch_warnings():
+ simplefilter("error")
loaded = loads(test_json_with_comments, ignore_comments=True)
- assert len(captured) == 0
assert loaded == test_object_for_comment_strings
# Passing False for argument explicitly should not have a warning
loads._ignore_comments_warned_ = False
- # noinspection PyTypeChecker
- with warns(None) as captured:
+ with catch_warnings():
+ simplefilter("error")
loaded = loads(test_json_without_comments, ignore_comments=False)
- assert len(captured) == 0
assert loaded == test_object_for_comment_strings
diff --git a/tests/test_np.py b/tests/test_np.py
index 8c13981..b7857ea 100644
--- a/tests/test_np.py
+++ b/tests/test_np.py
@@ -5,8 +5,9 @@ from copy import deepcopy
from os.path import join
from tempfile import mkdtemp
import sys
+from warnings import catch_warnings, simplefilter
-from _pytest.recwarn import warns
+from pytest import warns
from numpy import arange, ones, array, array_equal, finfo, iinfo, pi
from numpy import int8, int16, int32, int64, uint8, uint16, uint32, uint64, \
float16, float32, float64, complex64, complex128, zeros, ndindex
@@ -215,10 +216,9 @@ def test_compact_mode_unspecified():
data = [array([[1.0, 2.0, 3.0, 4.0], [5.0, 6.0, 7.0, 8.0]]), array([pi, exp(1)])]
with warns(JsonTricksDeprecation):
gz_json_1 = dumps(data, compression=True)
- # noinspection PyTypeChecker
- with warns(None) as captured:
+ with catch_warnings():
+ simplefilter("error")
gz_json_2 = dumps(data, compression=True)
- assert len(captured) == 0
assert gz_json_1 == gz_json_2
json = gzip_decompress(gz_json_1).decode('ascii')
assert json == '[{"__ndarray__": [[1.0, 2.0, 3.0, 4.0], [5.0, 6.0, 7.0, 8.0]], "dtype": "float64", "shape": [2, 4], "Corder": true}, ' \
|
