From 29c99b2fddeddd135877b7a15832c1aec224754a Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 16:47:01 +0000 Subject: [PATCH] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .github/workflows/ci.yml | 3 +++ sparse/finch_backend/__init__.py | 6 +++--- sparse/tests/conftest.py | 9 +++++++++ sparse/tests/test_backends.py | 5 ++--- 4 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 sparse/tests/conftest.py diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5175b40c..b51e1376 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,6 +41,9 @@ jobs: environment-file: ci/environment.yml python-version: ${{ matrix.python }} miniforge-version: latest + - uses: julia-actions/setup-julia@v1.9 + with: + version: '1.10' - name: Install package run: | pip install -e .[tests,finch] diff --git a/sparse/finch_backend/__init__.py b/sparse/finch_backend/__init__.py index a955a0aa..cd5586b6 100644 --- a/sparse/finch_backend/__init__.py +++ b/sparse/finch_backend/__init__.py @@ -1,9 +1,9 @@ try: - import finch + import finch # noqa: F401 except ModuleNotFoundError: - raise ImportError("Finch not installed. Run `pip install sparse[finch]` to enable Finch backend") + raise ImportError("Finch not installed. Run `pip install sparse[finch]` to enable Finch backend") from None -from finch import Tensor, permute_dims, astype +from finch import Tensor, astype, permute_dims __all__ = ["Tensor", "permute_dims", "astype"] diff --git a/sparse/tests/conftest.py b/sparse/tests/conftest.py new file mode 100644 index 00000000..8dd080ce --- /dev/null +++ b/sparse/tests/conftest.py @@ -0,0 +1,9 @@ +import sparse + +import pytest + + +@pytest.fixture(scope="session", params=[sparse.BackendType.PyData, sparse.BackendType.Finch]) +def backend(request): + with sparse.Backend(backend=request.param): + yield request.param diff --git a/sparse/tests/test_backends.py b/sparse/tests/test_backends.py index 4ec54576..c76dc360 100644 --- a/sparse/tests/test_backends.py +++ b/sparse/tests/test_backends.py @@ -1,9 +1,9 @@ import sparse -import scipy.sparse as sp -import numpy as np + import pytest import numpy as np +import scipy.sparse as sp def test_backend_contex_manager(backend): @@ -19,7 +19,6 @@ def test_finch_backend(): sp_arr = sp.csr_matrix(np_eye) with sparse.Backend(backend=sparse.BackendType.finch): - finch_dense = sparse.Tensor(np_eye) assert np.shares_memory(finch_dense.todense(), np_eye)