diff --git a/numcodecs/astype.py b/numcodecs/astype.py index b5c5abc9..4947d53c 100644 --- a/numcodecs/astype.py +++ b/numcodecs/astype.py @@ -49,9 +49,7 @@ def encode(self, buf): arr = ensure_ndarray(buf).view(self.decode_dtype) # convert and copy - enc = arr.astype(self.encode_dtype) - - return enc + return arr.astype(self.encode_dtype) def decode(self, buf, out=None): # normalise input @@ -61,9 +59,7 @@ def decode(self, buf, out=None): dec = enc.astype(self.decode_dtype) # handle output - out = ndarray_copy(dec, out) - - return out + return ndarray_copy(dec, out) def get_config(self): return { diff --git a/numcodecs/base64.py b/numcodecs/base64.py index 74f42161..307c6d52 100644 --- a/numcodecs/base64.py +++ b/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 diff --git a/numcodecs/categorize.py b/numcodecs/categorize.py index ed20ad61..c8199493 100644 --- a/numcodecs/categorize.py +++ b/numcodecs/categorize.py @@ -80,18 +80,15 @@ def decode(self, buf, out=None): dec[enc == (i + 1)] = label # handle output - dec = ndarray_copy(dec, out) - - return dec + return ndarray_copy(dec, out) def get_config(self): - config = { + return { '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 diff --git a/numcodecs/delta.py b/numcodecs/delta.py index ee4abbc7..32da2e04 100644 --- a/numcodecs/delta.py +++ b/numcodecs/delta.py @@ -85,9 +85,7 @@ def decode(self, buf, out=None): np.cumsum(enc, out=dec) # handle output - out = ndarray_copy(dec, out) - - return out + return ndarray_copy(dec, out) def get_config(self): # override to handle encoding dtypes diff --git a/numcodecs/fixedscaleoffset.py b/numcodecs/fixedscaleoffset.py index 636e439e..b1db5205 100644 --- a/numcodecs/fixedscaleoffset.py +++ b/numcodecs/fixedscaleoffset.py @@ -94,9 +94,7 @@ def encode(self, buf): enc = np.around(enc) # convert dtype - enc = enc.astype(self.astype, copy=False) - - return enc + return enc.astype(self.astype, copy=False) def decode(self, buf, out=None): # interpret buffer as numpy array diff --git a/numcodecs/gzip.py b/numcodecs/gzip.py index 12e9c011..4269bad9 100644 --- a/numcodecs/gzip.py +++ b/numcodecs/gzip.py @@ -28,9 +28,7 @@ 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 + return compressed.getvalue() # noinspection PyMethodMayBeStatic def decode(self, buf, out=None): diff --git a/numcodecs/quantize.py b/numcodecs/quantize.py index b9a8a311..b5b6cc3c 100644 --- a/numcodecs/quantize.py +++ b/numcodecs/quantize.py @@ -73,9 +73,7 @@ def encode(self, buf): enc = np.around(scale * arr) / scale # cast dtype - enc = enc.astype(self.astype, copy=False) - - return enc + return enc.astype(self.astype, copy=False) def decode(self, buf, out=None): # filter is lossy, decoding is no-op diff --git a/numcodecs/tests/test_blosc.py b/numcodecs/tests/test_blosc.py index 17b29138..8c187201 100644 --- a/numcodecs/tests/test_blosc.py +++ b/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]) diff --git a/numcodecs/tests/test_shuffle.py b/numcodecs/tests/test_shuffle.py index 1194e598..6e6d744a 100644 --- a/numcodecs/tests/test_shuffle.py +++ b/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]) diff --git a/pyproject.toml b/pyproject.toml index 928d901b..36d87fe7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -178,6 +178,7 @@ extend-select = [ "PIE", "PT", "PYI", + "RET", "RSE", "RUF", "UP", @@ -192,6 +193,9 @@ ignore = [ "PT004", # deprecated "PT005", # deprecated "PT011", + "PT012", + "RET505", + "RET506", "RUF001", "UP007", "UP027", # deprecated diff --git a/setup.py b/setup.py index 0f5ec481..6cbddf4a 100644 --- a/setup.py +++ b/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,8 +122,6 @@ def blosc_extension(): ), ] - return extensions - def zstd_extension(): info('setting up Zstandard extension') @@ -153,7 +151,7 @@ def zstd_extension(): extra_objects = [] # define extension module - extensions = [ + return [ Extension( 'numcodecs.zstd', sources=sources + zstd_sources, @@ -164,8 +162,6 @@ def zstd_extension(): ), ] - return extensions - def lz4_extension(): info('setting up LZ4 extension') @@ -182,7 +178,7 @@ def lz4_extension(): sources = ['numcodecs/lz4.pyx'] # define extension module - extensions = [ + return [ Extension( 'numcodecs.lz4', sources=sources + lz4_sources, @@ -192,8 +188,6 @@ def lz4_extension(): ), ] - return extensions - def vlen_extension(): info('setting up vlen extension') @@ -209,7 +203,7 @@ def vlen_extension(): sources = ['numcodecs/vlen.pyx'] # define extension module - extensions = [ + return [ Extension( 'numcodecs.vlen', sources=sources, @@ -219,8 +213,6 @@ def vlen_extension(): ), ] - return extensions - def fletcher_extension(): info('setting up fletcher32 extension') @@ -235,7 +227,7 @@ def fletcher_extension(): sources = ['numcodecs/fletcher32.pyx'] # define extension module - extensions = [ + return [ Extension( 'numcodecs.fletcher32', sources=sources, @@ -245,8 +237,6 @@ def fletcher_extension(): ), ] - return extensions - def jenkins_extension(): info('setting up jenkins extension') @@ -261,7 +251,7 @@ def jenkins_extension(): sources = ['numcodecs/jenkins.pyx'] # define extension module - extensions = [ + return [ Extension( 'numcodecs.jenkins', sources=sources, @@ -271,8 +261,6 @@ def jenkins_extension(): ), ] - return extensions - def compat_extension(): info('setting up compat extension') @@ -282,7 +270,7 @@ def compat_extension(): sources = ['numcodecs/compat_ext.pyx'] # define extension module - extensions = [ + return [ Extension( 'numcodecs.compat_ext', sources=sources, @@ -290,8 +278,6 @@ def compat_extension(): ), ] - return extensions - def shuffle_extension(): info('setting up shuffle extension') @@ -301,12 +287,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': ext_errors = (CCompilerError, ExecError, PlatformError, IOError, ValueError)