Merge branch 'zarr-developers-main'

Author: BwL1289

.github/workflows/wheel.yaml

@@ -26,7 +26,7 @@ jobs:
         with:
           submodules: true
 
-      - uses: pypa/cibuildwheel@v2.19.2
+      - uses: pypa/cibuildwheel@v2.20.0
 
       - uses: actions/upload-artifact@v4
         with:

.pre-commit-config.yaml

@@ -7,7 +7,7 @@ default_language_version:
   python: python3
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: 'v0.5.2'
+    rev: 'v0.6.2'
     hooks:
     - id: ruff
       args: ["--fix", "--show-fixes"]

docs/release.rst

@@ -21,6 +21,8 @@ Fix
 
 Maintenance
 ~~~~~~~~~~~
+* Change format() and old string formatting to f-strings.
+  By :user:`Dimitri Papadopoulos Orfanos <DimitriPapadopoulos>`, :issue:`439`.
 
 * Remove pin on Sphinx
   By :user:`Elliott Sales de Andrade <QuLogic>`, :issue:`552`.

notebooks/benchmark_vlen.ipynb

@@ -26,6 +26,7 @@
    "source": [
     "import numpy as np\n",
     "import numcodecs\n",
+    "\n",
     "numcodecs.__version__"
    ]
   },
@@ -54,10 +55,10 @@
     "    enc = codec.encode(a)\n",
     "    print('decode')\n",
     "    %timeit codec.decode(enc)\n",
-    "    print('size         : {:,}'.format(len(enc)))\n",
-    "    print('size (zstd 1): {:,}'.format(len(zstd1.encode(enc))))\n",
-    "    print('size (zstd 5): {:,}'.format(len(zstd5.encode(enc))))\n",
-    "    print('size (zstd 9): {:,}'.format(len(zstd9.encode(enc))))"
+    "    print(f'size         : {len(enc):,}')\n",
+    "    print(f'size (zstd 1): {len(zstd1.encode(enc)):,}')\n",
+    "    print(f'size (zstd 5): {len(zstd5.encode(enc)):,}')\n",
+    "    print(f'size (zstd 9): {len(zstd9.encode(enc)):,}')"
    ]
   },
   {
@@ -67,6 +68,7 @@
    "outputs": [],
    "source": [
     "from numcodecs.tests.common import greetings\n",
+    "\n",
     "msgpack_codec = numcodecs.MsgPack()\n",
     "json_codec = numcodecs.JSON()\n",
     "pickle_codec = numcodecs.Pickle()\n",
@@ -281,6 +283,7 @@
    "outputs": [],
    "source": [
     "from faker import Faker\n",
+    "\n",
     "fake = Faker()"
    ]
   },
@@ -554,8 +557,10 @@
    ],
    "source": [
     "np.random.seed(42)\n",
-    "data4 = np.array([np.random.randint(0, 100, size=np.random.randint(0, 20)).astype('i4')\n",
-    "                  for i in range(100000)], dtype=object)\n",
+    "data4 = np.array(\n",
+    "    [np.random.randint(0, 100, size=np.random.randint(0, 20)).astype('i4') for i in range(100000)],\n",
+    "    dtype=object,\n",
+    ")\n",
     "data4"
    ]
   },

numcodecs/abc.py

@@ -118,11 +118,9 @@ def __repr__(self):
         # by default, assume all non-private members are configuration
         # parameters and valid keyword arguments to constructor function
 
-        r = '%s(' % type(self).__name__
+        r = f'{type(self).__name__}('
         params = [
-            '{}={!r}'.format(k, getattr(self, k))
-            for k in sorted(self.__dict__)
-            if not k.startswith('_')
+            f'{k}={getattr(self, k)!r}' for k in sorted(self.__dict__) if not k.startswith('_')
         ]
         r += ', '.join(params) + ')'
         return r

numcodecs/astype.py

@@ -73,6 +73,4 @@ def get_config(self):
         }
 
     def __repr__(self):
-        return '{}(encode_dtype={!r}, decode_dtype={!r})'.format(
-            type(self).__name__, self.encode_dtype.str, self.decode_dtype.str
-        )
+        return f'{type(self).__name__}(encode_dtype={self.encode_dtype.str!r}, decode_dtype={self.decode_dtype.str!r})'

numcodecs/categorize.py

@@ -99,10 +99,4 @@ def __repr__(self):
         labels = repr(self.labels[:3])
         if len(self.labels) > 3:
             labels = labels[:-1] + ', ...]'
-        r = '%s(dtype=%r, astype=%r, labels=%s)' % (
-            type(self).__name__,
-            self.dtype.str,
-            self.astype.str,
-            labels,
-        )
-        return r
+        return f'{type(self).__name__}(dtype={self.dtype.str!r}, astype={self.astype.str!r}, labels={labels})'

numcodecs/compat.py

@@ -115,7 +115,7 @@ def ensure_contiguous_ndarray_like(buf, max_buffer_size=None, flatten=True) -> N
         raise ValueError("an array with contiguous memory is required")
 
     if max_buffer_size is not None and arr.nbytes > max_buffer_size:
-        msg = "Codec does not support buffers of > {} bytes".format(max_buffer_size)
+        msg = f"Codec does not support buffers of > {max_buffer_size} bytes"
         raise ValueError(msg)
 
     return arr

numcodecs/delta.py

@@ -91,8 +91,8 @@ def get_config(self):
         return dict(id=self.codec_id, dtype=self.dtype.str, astype=self.astype.str)
 
     def __repr__(self):
-        r = '{}(dtype={!r}'.format(type(self).__name__, self.dtype.str)
+        r = f'{type(self).__name__}(dtype={self.dtype.str!r}'
         if self.astype != self.dtype:
-            r += ', astype=%r' % self.astype.str
+            r += f', astype={self.astype.str!r}'
         r += ')'
         return r

numcodecs/fixedscaleoffset.py

@@ -15,7 +15,7 @@ class FixedScaleOffset(Codec):
     ----------
     offset : float
         Value to subtract from data.
-    scale : int
+    scale : float
         Value to multiply by data.
     dtype : dtype
         Data type to use for decoded data.
@@ -126,13 +126,8 @@ def get_config(self):
         )
 
     def __repr__(self):
-        r = '%s(scale=%s, offset=%s, dtype=%r' % (
-            type(self).__name__,
-            self.scale,
-            self.offset,
-            self.dtype.str,
-        )
+        r = f'{type(self).__name__}(scale={self.scale}, offset={self.offset}, dtype={self.dtype.str!r}'
         if self.astype != self.dtype:
-            r += ', astype=%r' % self.astype.str
+            r += f', astype={self.astype.str!r}'
         r += ')'
         return r