Merge branch 'main' into meson

Author: maxrjones

docs/release.rst

@@ -39,16 +39,15 @@ Maintenance
 
 * Move source code from ``numcodecs/`` to ``src/numcodecs/`` (src layout). This avoids
   import shadowing issues where the source tree's ``numcodecs/`` package (without compiled
-  C extensions) would shadow the installed package. Move test suite from
-  ``numcodecs/tests/`` to top-level ``tests/`` directory, following the standard layout
-  for meson-python projects (numpy, scipy, scikit-learn). Test imports change from
-  ``from numcodecs.tests.common import ...`` to ``from tests.common import ...``.
+  C extensions) would shadow the installed package.
 
   By :user:`Max Jones <maxrjones>`.
 
 * Rewrite contributing guide with pixi and uv development environment instructions.
 
   By :user:`Max Jones <maxrjones>`.
+* Move tests out of installable package into top-level ``tests/`` directory.
+  By :user:`Max Jones <maxrjones>`, :issue:`829`
 
 .. _release_0.16.5:
 

notebooks/benchmark_vlen.ipynb

@@ -64,18 +64,10 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": null,
    "metadata": {},
    "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",
-    "cat_codec = numcodecs.Categorize(greetings, dtype=object, astype='u1')\n",
-    "vlen_codec = numcodecs.VLenUTF8()"
-   ]
+   "source": "from tests.common import greetings\n\nmsgpack_codec = numcodecs.MsgPack()\njson_codec = numcodecs.JSON()\npickle_codec = numcodecs.Pickle()\ncat_codec = numcodecs.Categorize(greetings, dtype=object, astype='u1')\nvlen_codec = numcodecs.VLenUTF8()"
   },
   {
    "cell_type": "markdown",
@@ -678,4 +670,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 2
-}
+}

tests/common.py

@@ -6,11 +6,10 @@
 
 import numpy as np
 import pytest
-from numpy.testing import assert_array_almost_equal, assert_array_equal
-
 from numcodecs import *  # noqa: F403  # for eval to find names in repr tests
 from numcodecs.compat import ensure_bytes, ensure_ndarray
 from numcodecs.registry import get_codec
+from numpy.testing import assert_array_almost_equal, assert_array_equal
 
 greetings = [
     '¡Hola mundo!',

tests/test_bitround.py

@@ -1,6 +1,5 @@
 import numpy as np
 import pytest
-
 from numcodecs.bitround import BitRound, max_bits
 
 # adapted from https://github.com/milankl/BitInformation.jl/blob/main/test/round_nearest.jl

tests/test_compat.py

@@ -3,7 +3,6 @@
 
 import numpy as np
 import pytest
-
 from numcodecs.compat import ensure_bytes, ensure_contiguous_ndarray, ensure_text
 
 

tests/test_entrypoints.py

@@ -1,9 +1,8 @@
 import os.path
 import sys
 
-import pytest
-
 import numcodecs.registry
+import pytest
 
 here = os.path.abspath(os.path.dirname(__file__))
 

tests/test_entrypoints_backport.py

@@ -3,9 +3,8 @@
 import sys
 from multiprocessing import Process
 
-import pytest
-
 import numcodecs.registry
+import pytest
 
 importlib_spec = importlib.util.find_spec("importlib_metadata")
 if importlib_spec is None or importlib_spec.loader is None:  # pragma: no cover

tests/test_ndarray_like.py

@@ -1,5 +1,4 @@
 import pytest
-
 from numcodecs.ndarray_like import DType, FlagsObj, NDArrayLike
 
 

tests/test_registry.py

@@ -1,8 +1,7 @@
 import inspect
 
-import pytest
-
 import numcodecs
+import pytest
 from numcodecs.errors import UnknownCodecError
 from numcodecs.registry import get_codec