From 168269c69a74eb8dd4ba4c437fb5c4a14f56912e Mon Sep 17 00:00:00 2001 From: Lucas Colley Date: Wed, 27 May 2026 11:14:22 +0100 Subject: [PATCH] MAINT: refactor directories --- .github/workflows/array-api-tests.yml | 3 +++ pyproject.toml | 9 ++++++--- {array_api_compat => src/array_api_compat}/__init__.py | 0 {array_api_compat => src/array_api_compat}/_internal.py | 0 .../array_api_compat}/common/__init__.py | 0 .../array_api_compat}/common/_aliases.py | 0 .../array_api_compat}/common/_fft.py | 0 .../array_api_compat}/common/_helpers.py | 0 .../array_api_compat}/common/_linalg.py | 0 .../array_api_compat}/common/_typing.py | 0 .../array_api_compat}/cupy/__init__.py | 0 .../array_api_compat}/cupy/_aliases.py | 0 {array_api_compat => src/array_api_compat}/cupy/_info.py | 0 .../array_api_compat}/cupy/_typing.py | 0 {array_api_compat => src/array_api_compat}/cupy/fft.py | 0 .../array_api_compat}/cupy/linalg.py | 0 .../array_api_compat}/dask/__init__.py | 0 .../array_api_compat}/dask/array/__init__.py | 0 .../array_api_compat}/dask/array/_aliases.py | 0 .../array_api_compat}/dask/array/_info.py | 0 .../array_api_compat}/dask/array/fft.py | 0 .../array_api_compat}/dask/array/linalg.py | 0 .../array_api_compat}/numpy/__init__.py | 0 .../array_api_compat}/numpy/_aliases.py | 0 .../array_api_compat}/numpy/_info.py | 0 .../array_api_compat}/numpy/_typing.py | 0 {array_api_compat => src/array_api_compat}/numpy/fft.py | 0 .../array_api_compat}/numpy/linalg.py | 0 {array_api_compat => src/array_api_compat}/py.typed | 0 .../array_api_compat}/torch/__init__.py | 0 .../array_api_compat}/torch/_aliases.py | 0 .../array_api_compat}/torch/_info.py | 0 .../array_api_compat}/torch/_typing.py | 0 {array_api_compat => src/array_api_compat}/torch/fft.py | 0 .../array_api_compat}/torch/linalg.py | 0 vendor_test/vendored/_compat | 2 +- 36 files changed, 10 insertions(+), 4 deletions(-) rename {array_api_compat => src/array_api_compat}/__init__.py (100%) rename {array_api_compat => src/array_api_compat}/_internal.py (100%) rename {array_api_compat => src/array_api_compat}/common/__init__.py (100%) rename {array_api_compat => src/array_api_compat}/common/_aliases.py (100%) rename {array_api_compat => src/array_api_compat}/common/_fft.py (100%) rename {array_api_compat => src/array_api_compat}/common/_helpers.py (100%) rename {array_api_compat => src/array_api_compat}/common/_linalg.py (100%) rename {array_api_compat => src/array_api_compat}/common/_typing.py (100%) rename {array_api_compat => src/array_api_compat}/cupy/__init__.py (100%) rename {array_api_compat => src/array_api_compat}/cupy/_aliases.py (100%) rename {array_api_compat => src/array_api_compat}/cupy/_info.py (100%) rename {array_api_compat => src/array_api_compat}/cupy/_typing.py (100%) rename {array_api_compat => src/array_api_compat}/cupy/fft.py (100%) rename {array_api_compat => src/array_api_compat}/cupy/linalg.py (100%) rename {array_api_compat => src/array_api_compat}/dask/__init__.py (100%) rename {array_api_compat => src/array_api_compat}/dask/array/__init__.py (100%) rename {array_api_compat => src/array_api_compat}/dask/array/_aliases.py (100%) rename {array_api_compat => src/array_api_compat}/dask/array/_info.py (100%) rename {array_api_compat => src/array_api_compat}/dask/array/fft.py (100%) rename {array_api_compat => src/array_api_compat}/dask/array/linalg.py (100%) rename {array_api_compat => src/array_api_compat}/numpy/__init__.py (100%) rename {array_api_compat => src/array_api_compat}/numpy/_aliases.py (100%) rename {array_api_compat => src/array_api_compat}/numpy/_info.py (100%) rename {array_api_compat => src/array_api_compat}/numpy/_typing.py (100%) rename {array_api_compat => src/array_api_compat}/numpy/fft.py (100%) rename {array_api_compat => src/array_api_compat}/numpy/linalg.py (100%) rename {array_api_compat => src/array_api_compat}/py.typed (100%) rename {array_api_compat => src/array_api_compat}/torch/__init__.py (100%) rename {array_api_compat => src/array_api_compat}/torch/_aliases.py (100%) rename {array_api_compat => src/array_api_compat}/torch/_info.py (100%) rename {array_api_compat => src/array_api_compat}/torch/_typing.py (100%) rename {array_api_compat => src/array_api_compat}/torch/fft.py (100%) rename {array_api_compat => src/array_api_compat}/torch/linalg.py (100%) diff --git a/.github/workflows/array-api-tests.yml b/.github/workflows/array-api-tests.yml index 67ae76f5..36533342 100644 --- a/.github/workflows/array-api-tests.yml +++ b/.github/workflows/array-api-tests.yml @@ -78,6 +78,9 @@ jobs: python -m pip install -r ${GITHUB_WORKSPACE}/array-api-tests/requirements.txt python -m pip install pytest-xdist + - name: Install array-api-compat + run: python -m pip install ${GITHUB_WORKSPACE}/array-api-compat + - name: Dump pip environment run: pip freeze diff --git a/pyproject.toml b/pyproject.toml index d7339170..a2986543 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -56,10 +56,13 @@ homepage = "https://data-apis.org/array-api-compat/" repository = "https://github.com/data-apis/array-api-compat/" [tool.setuptools.dynamic] -version = {attr = "array_api_compat.__version__"} +version = { attr = "array_api_compat.__version__" } + +[tool.setuptools] +package-dir = {"" = "src"} [tool.setuptools.packages.find] -include = ["array_api_compat*"] +where = ["src"] namespaces = false [tool.ruff.lint] @@ -92,7 +95,7 @@ ignore = [ [tool.mypy] -files = ["array_api_compat"] +files = ["src/array_api_compat"] disallow_incomplete_defs = true disallow_untyped_decorators = true disallow_untyped_defs = false # TODO diff --git a/array_api_compat/__init__.py b/src/array_api_compat/__init__.py similarity index 100% rename from array_api_compat/__init__.py rename to src/array_api_compat/__init__.py diff --git a/array_api_compat/_internal.py b/src/array_api_compat/_internal.py similarity index 100% rename from array_api_compat/_internal.py rename to src/array_api_compat/_internal.py diff --git a/array_api_compat/common/__init__.py b/src/array_api_compat/common/__init__.py similarity index 100% rename from array_api_compat/common/__init__.py rename to src/array_api_compat/common/__init__.py diff --git a/array_api_compat/common/_aliases.py b/src/array_api_compat/common/_aliases.py similarity index 100% rename from array_api_compat/common/_aliases.py rename to src/array_api_compat/common/_aliases.py diff --git a/array_api_compat/common/_fft.py b/src/array_api_compat/common/_fft.py similarity index 100% rename from array_api_compat/common/_fft.py rename to src/array_api_compat/common/_fft.py diff --git a/array_api_compat/common/_helpers.py b/src/array_api_compat/common/_helpers.py similarity index 100% rename from array_api_compat/common/_helpers.py rename to src/array_api_compat/common/_helpers.py diff --git a/array_api_compat/common/_linalg.py b/src/array_api_compat/common/_linalg.py similarity index 100% rename from array_api_compat/common/_linalg.py rename to src/array_api_compat/common/_linalg.py diff --git a/array_api_compat/common/_typing.py b/src/array_api_compat/common/_typing.py similarity index 100% rename from array_api_compat/common/_typing.py rename to src/array_api_compat/common/_typing.py diff --git a/array_api_compat/cupy/__init__.py b/src/array_api_compat/cupy/__init__.py similarity index 100% rename from array_api_compat/cupy/__init__.py rename to src/array_api_compat/cupy/__init__.py diff --git a/array_api_compat/cupy/_aliases.py b/src/array_api_compat/cupy/_aliases.py similarity index 100% rename from array_api_compat/cupy/_aliases.py rename to src/array_api_compat/cupy/_aliases.py diff --git a/array_api_compat/cupy/_info.py b/src/array_api_compat/cupy/_info.py similarity index 100% rename from array_api_compat/cupy/_info.py rename to src/array_api_compat/cupy/_info.py diff --git a/array_api_compat/cupy/_typing.py b/src/array_api_compat/cupy/_typing.py similarity index 100% rename from array_api_compat/cupy/_typing.py rename to src/array_api_compat/cupy/_typing.py diff --git a/array_api_compat/cupy/fft.py b/src/array_api_compat/cupy/fft.py similarity index 100% rename from array_api_compat/cupy/fft.py rename to src/array_api_compat/cupy/fft.py diff --git a/array_api_compat/cupy/linalg.py b/src/array_api_compat/cupy/linalg.py similarity index 100% rename from array_api_compat/cupy/linalg.py rename to src/array_api_compat/cupy/linalg.py diff --git a/array_api_compat/dask/__init__.py b/src/array_api_compat/dask/__init__.py similarity index 100% rename from array_api_compat/dask/__init__.py rename to src/array_api_compat/dask/__init__.py diff --git a/array_api_compat/dask/array/__init__.py b/src/array_api_compat/dask/array/__init__.py similarity index 100% rename from array_api_compat/dask/array/__init__.py rename to src/array_api_compat/dask/array/__init__.py diff --git a/array_api_compat/dask/array/_aliases.py b/src/array_api_compat/dask/array/_aliases.py similarity index 100% rename from array_api_compat/dask/array/_aliases.py rename to src/array_api_compat/dask/array/_aliases.py diff --git a/array_api_compat/dask/array/_info.py b/src/array_api_compat/dask/array/_info.py similarity index 100% rename from array_api_compat/dask/array/_info.py rename to src/array_api_compat/dask/array/_info.py diff --git a/array_api_compat/dask/array/fft.py b/src/array_api_compat/dask/array/fft.py similarity index 100% rename from array_api_compat/dask/array/fft.py rename to src/array_api_compat/dask/array/fft.py diff --git a/array_api_compat/dask/array/linalg.py b/src/array_api_compat/dask/array/linalg.py similarity index 100% rename from array_api_compat/dask/array/linalg.py rename to src/array_api_compat/dask/array/linalg.py diff --git a/array_api_compat/numpy/__init__.py b/src/array_api_compat/numpy/__init__.py similarity index 100% rename from array_api_compat/numpy/__init__.py rename to src/array_api_compat/numpy/__init__.py diff --git a/array_api_compat/numpy/_aliases.py b/src/array_api_compat/numpy/_aliases.py similarity index 100% rename from array_api_compat/numpy/_aliases.py rename to src/array_api_compat/numpy/_aliases.py diff --git a/array_api_compat/numpy/_info.py b/src/array_api_compat/numpy/_info.py similarity index 100% rename from array_api_compat/numpy/_info.py rename to src/array_api_compat/numpy/_info.py diff --git a/array_api_compat/numpy/_typing.py b/src/array_api_compat/numpy/_typing.py similarity index 100% rename from array_api_compat/numpy/_typing.py rename to src/array_api_compat/numpy/_typing.py diff --git a/array_api_compat/numpy/fft.py b/src/array_api_compat/numpy/fft.py similarity index 100% rename from array_api_compat/numpy/fft.py rename to src/array_api_compat/numpy/fft.py diff --git a/array_api_compat/numpy/linalg.py b/src/array_api_compat/numpy/linalg.py similarity index 100% rename from array_api_compat/numpy/linalg.py rename to src/array_api_compat/numpy/linalg.py diff --git a/array_api_compat/py.typed b/src/array_api_compat/py.typed similarity index 100% rename from array_api_compat/py.typed rename to src/array_api_compat/py.typed diff --git a/array_api_compat/torch/__init__.py b/src/array_api_compat/torch/__init__.py similarity index 100% rename from array_api_compat/torch/__init__.py rename to src/array_api_compat/torch/__init__.py diff --git a/array_api_compat/torch/_aliases.py b/src/array_api_compat/torch/_aliases.py similarity index 100% rename from array_api_compat/torch/_aliases.py rename to src/array_api_compat/torch/_aliases.py diff --git a/array_api_compat/torch/_info.py b/src/array_api_compat/torch/_info.py similarity index 100% rename from array_api_compat/torch/_info.py rename to src/array_api_compat/torch/_info.py diff --git a/array_api_compat/torch/_typing.py b/src/array_api_compat/torch/_typing.py similarity index 100% rename from array_api_compat/torch/_typing.py rename to src/array_api_compat/torch/_typing.py diff --git a/array_api_compat/torch/fft.py b/src/array_api_compat/torch/fft.py similarity index 100% rename from array_api_compat/torch/fft.py rename to src/array_api_compat/torch/fft.py diff --git a/array_api_compat/torch/linalg.py b/src/array_api_compat/torch/linalg.py similarity index 100% rename from array_api_compat/torch/linalg.py rename to src/array_api_compat/torch/linalg.py diff --git a/vendor_test/vendored/_compat b/vendor_test/vendored/_compat index ba484f91..0f2a5b5e 120000 --- a/vendor_test/vendored/_compat +++ b/vendor_test/vendored/_compat @@ -1 +1 @@ -../../array_api_compat/ \ No newline at end of file +../../src/array_api_compat/ \ No newline at end of file