diff options
| author | Ralf Gommers <ralf.gommers@gmail.com> | 2019-12-06 11:03:03 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-06 11:03:03 -0800 |
| commit | f6a7a440669c6f386a1b15e081c6db740bb87a88 (patch) | |
| tree | eececcc92e1c14eb08d46591ec7aab5932b9ea31 /numpy/random | |
| parent | abde0a775e19b9f84cb3930f065cdf07f94f8526 (diff) | |
| download | numpy-revert-14794-nep-0034-impl.tar.gz | |
Revert "DEP: issue deprecation warning when creating ragged array (NEP 34)"revert-14794-nep-0034-impl
Diffstat (limited to 'numpy/random')
| -rw-r--r-- | numpy/random/tests/test_generator_mt19937_regressions.py | 7 | ||||
| -rw-r--r-- | numpy/random/tests/test_randomstate_regression.py | 5 | ||||
| -rw-r--r-- | numpy/random/tests/test_regression.py | 5 |
3 files changed, 7 insertions, 10 deletions
diff --git a/numpy/random/tests/test_generator_mt19937_regressions.py b/numpy/random/tests/test_generator_mt19937_regressions.py index e328c0c71..3a937f997 100644 --- a/numpy/random/tests/test_generator_mt19937_regressions.py +++ b/numpy/random/tests/test_generator_mt19937_regressions.py @@ -56,10 +56,9 @@ class TestRegression(object): [1, (2, 2), (3, 3), None], [(1, 1), 2, 3, None]]: mt19937 = Generator(MT19937(12345)) - shuffled = np.array(t, dtype=object) + shuffled = list(t) mt19937.shuffle(shuffled) - expected = np.array([t[2], t[0], t[3], t[1]], dtype=object) - assert_array_equal(np.array(shuffled, dtype=object), expected) + assert_array_equal(shuffled, [t[2], t[0], t[3], t[1]]) def test_call_within_randomstate(self): # Check that custom BitGenerator does not call into global state @@ -119,7 +118,7 @@ class TestRegression(object): # a segfault on garbage collection. # See gh-7719 mt19937 = Generator(MT19937(1234)) - a = np.array([np.arange(1), np.arange(4)], dtype=object) + a = np.array([np.arange(1), np.arange(4)]) for _ in range(1000): mt19937.shuffle(a) diff --git a/numpy/random/tests/test_randomstate_regression.py b/numpy/random/tests/test_randomstate_regression.py index 827240cef..bdc2214b6 100644 --- a/numpy/random/tests/test_randomstate_regression.py +++ b/numpy/random/tests/test_randomstate_regression.py @@ -68,8 +68,7 @@ class TestRegression(object): random.seed(12345) shuffled = list(t) random.shuffle(shuffled) - expected = np.array([t[0], t[3], t[1], t[2]], dtype=object) - assert_array_equal(np.array(shuffled, dtype=object), expected) + assert_array_equal(shuffled, [t[0], t[3], t[1], t[2]]) def test_call_within_randomstate(self): # Check that custom RandomState does not call into global state @@ -129,7 +128,7 @@ class TestRegression(object): # a segfault on garbage collection. # See gh-7719 random.seed(1234) - a = np.array([np.arange(1), np.arange(4)], dtype=object) + a = np.array([np.arange(1), np.arange(4)]) for _ in range(1000): random.shuffle(a) diff --git a/numpy/random/tests/test_regression.py b/numpy/random/tests/test_regression.py index 3cc289a80..509e2d57f 100644 --- a/numpy/random/tests/test_regression.py +++ b/numpy/random/tests/test_regression.py @@ -66,8 +66,7 @@ class TestRegression(object): np.random.seed(12345) shuffled = list(t) random.shuffle(shuffled) - expected = np.array([t[0], t[3], t[1], t[2]], dtype=object) - assert_array_equal(np.array(shuffled, dtype=object), expected) + assert_array_equal(shuffled, [t[0], t[3], t[1], t[2]]) def test_call_within_randomstate(self): # Check that custom RandomState does not call into global state @@ -127,7 +126,7 @@ class TestRegression(object): # a segfault on garbage collection. # See gh-7719 np.random.seed(1234) - a = np.array([np.arange(1), np.arange(4)], dtype=object) + a = np.array([np.arange(1), np.arange(4)]) for _ in range(1000): np.random.shuffle(a) |