Apply ruff/flake8-return rule RET504

RET504 Unnecessary assignment before `return` statement

Author: jakirkham

numcodecs/astype.py

@@ -49,9 +49,8 @@ def encode(self, buf):
         arr = ensure_ndarray(buf).view(self.decode_dtype)
 
         # convert and copy
-        enc = arr.astype(self.encode_dtype)
+        return arr.astype(self.encode_dtype)
 
-        return enc
 
     def decode(self, buf, out=None):
         # normalise input
@@ -61,9 +60,8 @@ def decode(self, buf, out=None):
         dec = enc.astype(self.decode_dtype)
 
         # handle output
-        out = ndarray_copy(dec, out)
+        return ndarray_copy(dec, out)
 
-        return out
 
     def get_config(self):
         return {

numcodecs/base64.py

@@ -13,8 +13,7 @@ def encode(self, buf):
         # normalise inputs
         buf = ensure_contiguous_ndarray(buf)
         # do compression
-        compressed = _base64.standard_b64encode(buf)
-        return compressed
+        return _base64.standard_b64encode(buf)
 
     def decode(self, buf, out=None):
         # normalise inputs

numcodecs/categorize.py

@@ -80,18 +80,16 @@ def decode(self, buf, out=None):
             dec[enc == (i + 1)] = label
 
         # handle output
-        dec = ndarray_copy(dec, out)
+        return ndarray_copy(dec, out)
 
-        return dec
 
     def get_config(self):
-        config = dict(
+        return dict(
             id=self.codec_id,
             labels=self.labels,
             dtype=self.dtype.str,
             astype=self.astype.str,
         )
-        return config
 
     def __repr__(self):
         # make sure labels part is not too long

numcodecs/delta.py

@@ -85,9 +85,8 @@ def decode(self, buf, out=None):
         np.cumsum(enc, out=dec)
 
         # handle output
-        out = ndarray_copy(dec, out)
+        return ndarray_copy(dec, out)
 
-        return out
 
     def get_config(self):
         # override to handle encoding dtypes

numcodecs/fixedscaleoffset.py

@@ -94,9 +94,8 @@ def encode(self, buf):
         enc = np.around(enc)
 
         # convert dtype
-        enc = enc.astype(self.astype, copy=False)
+        return enc.astype(self.astype, copy=False)
 
-        return enc
 
     def decode(self, buf, out=None):
         # interpret buffer as numpy array

numcodecs/gzip.py

@@ -28,9 +28,8 @@ def encode(self, buf):
         compressed = io.BytesIO()
         with _gzip.GzipFile(fileobj=compressed, mode='wb', compresslevel=self.level) as compressor:
             compressor.write(buf)
-        compressed = compressed.getvalue()
+        return compressed.getvalue()
 
-        return compressed
 
     # noinspection PyMethodMayBeStatic
     def decode(self, buf, out=None):

numcodecs/quantize.py

@@ -73,9 +73,8 @@ def encode(self, buf):
         enc = np.around(scale * arr) / scale
 
         # cast dtype
-        enc = enc.astype(self.astype, copy=False)
+        return enc.astype(self.astype, copy=False)
 
-        return enc
 
     def decode(self, buf, out=None):
         # filter is lossy, decoding is no-op

numcodecs/tests/test_blosc.py

@@ -215,14 +215,12 @@ def test_backwards_compatibility():
 
 def _encode_worker(data):
     compressor = Blosc(cname='zlib', clevel=9, shuffle=Blosc.SHUFFLE)
-    enc = compressor.encode(data)
-    return enc
+    return compressor.encode(data)
 
 
 def _decode_worker(enc):
     compressor = Blosc()
-    data = compressor.decode(enc)
-    return data
+    return compressor.decode(enc)
 
 
 @pytest.mark.parametrize('pool', [Pool, ThreadPool])

numcodecs/tests/test_shuffle.py

@@ -79,14 +79,12 @@ def test_eq():
 
 def _encode_worker(data):
     compressor = Shuffle()
-    enc = compressor.encode(data)
-    return enc
+    return compressor.encode(data)
 
 
 def _decode_worker(enc):
     compressor = Shuffle()
-    data = compressor.decode(enc)
-    return data
+    return compressor.decode(enc)
 
 
 @pytest.mark.parametrize('pool', [Pool, ThreadPool])

setup.py

@@ -111,7 +111,7 @@ def blosc_extension():
     sources = ['numcodecs/blosc.pyx']
 
     # define extension module
-    extensions = [
+    return [
         Extension(
             'numcodecs.blosc',
             sources=sources + blosc_sources,
@@ -122,7 +122,6 @@ def blosc_extension():
         ),
     ]
 
-    return extensions
 
 
 def zstd_extension():
@@ -153,7 +152,7 @@ def zstd_extension():
         extra_objects = []
 
     # define extension module
-    extensions = [
+    return [
         Extension(
             'numcodecs.zstd',
             sources=sources + zstd_sources,
@@ -164,7 +163,6 @@ def zstd_extension():
         ),
     ]
 
-    return extensions
 
 
 def lz4_extension():
@@ -182,7 +180,7 @@ def lz4_extension():
     sources = ['numcodecs/lz4.pyx']
 
     # define extension module
-    extensions = [
+    return [
         Extension(
             'numcodecs.lz4',
             sources=sources + lz4_sources,
@@ -192,7 +190,6 @@ def lz4_extension():
         ),
     ]
 
-    return extensions
 
 
 def vlen_extension():
@@ -209,7 +206,7 @@ def vlen_extension():
     sources = ['numcodecs/vlen.pyx']
 
     # define extension module
-    extensions = [
+    return [
         Extension(
             'numcodecs.vlen',
             sources=sources,
@@ -219,7 +216,6 @@ def vlen_extension():
         ),
     ]
 
-    return extensions
 
 
 def fletcher_extension():
@@ -235,7 +231,7 @@ def fletcher_extension():
     sources = ['numcodecs/fletcher32.pyx']
 
     # define extension module
-    extensions = [
+    return [
         Extension(
             'numcodecs.fletcher32',
             sources=sources,
@@ -245,7 +241,6 @@ def fletcher_extension():
         ),
     ]
 
-    return extensions
 
 
 def jenkins_extension():
@@ -261,7 +256,7 @@ def jenkins_extension():
     sources = ['numcodecs/jenkins.pyx']
 
     # define extension module
-    extensions = [
+    return [
         Extension(
             'numcodecs.jenkins',
             sources=sources,
@@ -271,7 +266,6 @@ def jenkins_extension():
         ),
     ]
 
-    return extensions
 
 
 def compat_extension():
@@ -282,15 +276,14 @@ def compat_extension():
     sources = ['numcodecs/compat_ext.pyx']
 
     # define extension module
-    extensions = [
+    return [
         Extension(
             'numcodecs.compat_ext',
             sources=sources,
             extra_compile_args=extra_compile_args,
         ),
     ]
 
-    return extensions
 
 
 def shuffle_extension():
@@ -301,11 +294,10 @@ def shuffle_extension():
     sources = ['numcodecs/_shuffle.pyx']
 
     # define extension module
-    extensions = [
+    return [
         Extension('numcodecs._shuffle', sources=sources, extra_compile_args=extra_compile_args),
     ]
 
-    return extensions
 
 
 if sys.platform == 'win32':