diff options
| author | czgdp1807 <gdp.1807@gmail.com> | 2021-06-07 15:05:24 +0530 |
|---|---|---|
| committer | czgdp1807 <gdp.1807@gmail.com> | 2021-06-07 15:05:24 +0530 |
| commit | 6f0f6ac879724aaa105dcf29def1e88e66420f5c (patch) | |
| tree | 6cef9901c1c7f2365bcf10cf1fb2a061a0ee5d72 /numpy/lib/tests | |
| parent | 4e59da126b522dd5a894041a4c9570e130fe7ae4 (diff) | |
| parent | 21838b4b21d8c702730aba80131fe6ee5fe5116f (diff) | |
| download | numpy-6f0f6ac879724aaa105dcf29def1e88e66420f5c.tar.gz | |
resolved conflicts
Diffstat (limited to 'numpy/lib/tests')
| -rw-r--r-- | numpy/lib/tests/test_regression.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/numpy/lib/tests/test_regression.py b/numpy/lib/tests/test_regression.py index 94fac7ef0..373226277 100644 --- a/numpy/lib/tests/test_regression.py +++ b/numpy/lib/tests/test_regression.py @@ -64,8 +64,7 @@ class TestRegression: def test_mem_string_concat(self): # Ticket #469 x = np.array([]) - with pytest.warns(FutureWarning): - np.append(x, 'asdasd\tasdasd') + np.append(x, 'asdasd\tasdasd') def test_poly_div(self): # Ticket #553 |