remove unneeded environment variables

Author: grlee77

zarr/tests/test_core.py

@@ -18,7 +18,7 @@
 from pkg_resources import parse_version
 
 from zarr.core import Array
-from zarr.meta import json_loads, ZARR_V3_ALLOW_OBJECTARRAY, ZARR_V3_ALLOW_STRUCTURED
+from zarr.meta import json_loads
 from zarr.n5 import N5Store, N5FSStore, n5_keywords
 from zarr.storage import (
     ABSStore,
@@ -1007,11 +1007,6 @@ def test_array_dtype_shape(self):
     def check_structured_array(self, d, fill_values):
         for a in (d, d[:0]):
             for fill_value in fill_values:
-                if self._version == 3 and not ZARR_V3_ALLOW_STRUCTURED:
-                    with pytest.raises(ValueError):
-                        self.create_array(shape=a.shape, chunks=2, dtype=a.dtype,
-                                          fill_value=fill_value)
-                    return
                 z = self.create_array(shape=a.shape, chunks=2, dtype=a.dtype, fill_value=fill_value)
                 assert len(a) == len(z)
                 assert a.shape == z.shape
@@ -1130,11 +1125,6 @@ def test_object_arrays(self):
         with pytest.raises(ValueError):
             self.create_array(shape=10, chunks=3, dtype=object)
 
-        if self._version == 3 and not ZARR_V3_ALLOW_OBJECTARRAY:
-            with pytest.raises(ValueError):
-                self.create_array(shape=10, chunks=3, dtype=object, filters=[MsgPack()])
-            return
-
         # an object_codec is required for object arrays, but allow to be provided via
         # filters to maintain API backwards compatibility
         with pytest.warns(FutureWarning):
@@ -1192,11 +1182,6 @@ def test_object_arrays(self):
     def test_object_arrays_vlen_text(self):
 
         data = np.array(greetings * 1000, dtype=object)
-
-        if self._version == 3 and not ZARR_V3_ALLOW_OBJECTARRAY:
-            with pytest.raises(ValueError):
-                self.create_array(shape=data.shape, dtype=object, object_codec=VLenUTF8())
-            return
         z = self.create_array(shape=data.shape, dtype=object, object_codec=VLenUTF8())
         z[0] = 'foo'
         assert z[0] == 'foo'
@@ -1244,10 +1229,6 @@ def test_object_arrays_vlen_bytes(self):
         greetings_bytes = [g.encode('utf8') for g in greetings]
         data = np.array(greetings_bytes * 1000, dtype=object)
 
-        if self._version == 3 and not ZARR_V3_ALLOW_OBJECTARRAY:
-            with pytest.raises(ValueError):
-                self.create_array(shape=data.shape, dtype=object, object_codec=VLenBytes())
-            return
         z = self.create_array(shape=data.shape, dtype=object, object_codec=VLenBytes())
         z[0] = b'foo'
         assert z[0] == b'foo'
@@ -1289,11 +1270,6 @@ def compare_arrays(expected, actual, item_dtype):
                 assert_array_equal(ev, av)
                 assert av.dtype == item_dtype
 
-        if self._version == 3 and not ZARR_V3_ALLOW_OBJECTARRAY:
-            with pytest.raises(ValueError):
-                self.create_array(shape=data.shape, dtype=object, object_codec=VLenArray('<u4'))
-            return
-
         codecs = VLenArray(int), VLenArray('<u4')
         for codec in codecs:
             z = self.create_array(shape=data.shape, dtype=object, object_codec=codec)
@@ -1317,12 +1293,6 @@ def compare_arrays(expected, actual, item_dtype):
 
     def test_object_arrays_danger(self):
 
-        if self._version == 3 and not ZARR_V3_ALLOW_OBJECTARRAY:
-            with pytest.raises(ValueError):
-                self.create_array(shape=5, chunks=2, dtype=object, fill_value=0,
-                                  object_codec=MsgPack())
-            return
-
         # do something dangerous - manually force an object array with no object codec
         z = self.create_array(shape=5, chunks=2, dtype=object, fill_value=0,
                               object_codec=MsgPack())
@@ -1367,11 +1337,6 @@ def test_structured_array_contain_object(self):
         a = np.array([(b'aaa', 1),
                       (b'bbb', 2)], dtype=structured_dtype)
 
-        if self._version == 3 and not ZARR_V3_ALLOW_STRUCTURED:
-            with pytest.raises(ValueError):
-                self.create_array(shape=a.shape, dtype=structured_dtype)
-            return
-
         # zarr-array with structured dtype require object codec
         with pytest.raises(ValueError):
             self.create_array(shape=a.shape, dtype=structured_dtype)
@@ -1520,16 +1485,6 @@ def test_attributes(self):
         a.store.close()
 
     def test_structured_with_object(self):
-        if self._version == 3 and not (ZARR_V3_ALLOW_OBJECTARRAY
-                                       and ZARR_V3_ALLOW_STRUCTURED):
-            with pytest.raises(ValueError):
-                self.create_array(fill_value=(0.0, None),
-                                  shape=10,
-                                  chunks=10,
-                                  dtype=[('x', float), ('y', object)],
-                                  object_codec=Pickle())
-            return
-
         a = self.create_array(fill_value=(0.0, None),
                               shape=10,
                               chunks=10,

zarr/tests/test_core_v3.py

@@ -11,7 +11,7 @@
 
 from zarr.core import Array
 from zarr.errors import ArrayNotFoundError, ContainsGroupError
-from zarr.meta import json_loads, ZARR_V3_ALLOW_COMPLEX, ZARR_V3_ALLOW_DATETIME
+from zarr.meta import json_loads
 from zarr.storage import (
     # ABSStoreV3,
     DBMStoreV3,
@@ -157,10 +157,6 @@ def test_dtypes(self):
 
         # complex
         for dtype in 'c8', 'c16':
-            if not ZARR_V3_ALLOW_COMPLEX:
-                with pytest.raises(ValueError):
-                    self.create_array(shape=10, chunks=3, dtype=dtype)
-                return
             z = self.create_array(shape=10, chunks=3, dtype=dtype)
             assert z.dtype == np.dtype(dtype)
             a = np.linspace(0, 1, z.shape[0], dtype=dtype)
@@ -173,10 +169,6 @@ def test_dtypes(self):
         for base_type in 'Mm':
             for resolution in 'D', 'us', 'ns':
                 dtype = '{}8[{}]'.format(base_type, resolution)
-                if not ZARR_V3_ALLOW_DATETIME:
-                    with pytest.raises(ValueError):
-                        self.create_array(shape=100, dtype=dtype, fill_value=0)
-                    return
                 z = self.create_array(shape=100, dtype=dtype, fill_value=0)
                 assert z.dtype == np.dtype(dtype)
                 a = np.random.randint(np.iinfo('i8').min, np.iinfo('i8').max,