necessary changes

Author: flying-sheep

.pre-commit-config.yaml

@@ -23,9 +23,9 @@ repos:
     rev: v4.6.0
     hooks:
     -   id: trailing-whitespace
-        exclude: scanpy/tests/_data
+        exclude: tests/_data
     -   id: end-of-file-fixer
-        exclude: scanpy/tests/_data
+        exclude: tests/_data
     -   id: check-added-large-files
     -   id: check-case-conflict
     -   id: check-toml

pyproject.toml

@@ -85,7 +85,7 @@ scanpy = "scanpy.cli:console_main"
 
 [project.optional-dependencies]
 test-min = [
-    "pytest>=7.4.2,!=8.1.*",
+    "pytest>=8.2",
     "pytest-nunit",
     "pytest-mock",
     "pytest-cov",
@@ -153,26 +153,23 @@ rapids = ["cudf>=0.9", "cuml>=0.9", "cugraph>=0.9"]  # GPU accelerated calculati
 dask = ["dask[array]>=2022.09.2"]  # Use the Dask parallelization engine
 dask-ml = ["dask-ml", "scanpy[dask]"]  # Dask-ML for sklearn-like API
 
-[tool.hatch.build]
-exclude = ["scanpy/tests"]
 [tool.hatch.build.targets.wheel]
-# TODO: move scanpy to src/
-only-include = ["src/testing", "scanpy"]
-sources = ["src", "."]
+packages = ["src/testing", "src/scanpy"]
 [tool.hatch.version]
 source = "vcs"
 [tool.hatch.build.hooks.vcs]
-version-file = "scanpy/_version.py"
+version-file = "src/scanpy/_version.py"
 
 [tool.pytest.ini_options]
 addopts = [
     "--import-mode=importlib",
     "--strict-markers",
     "--doctest-modules",
     "-ptesting.scanpy._pytest",
+    "--pyargs",
 ]
-testpaths = ["scanpy"]
-norecursedirs = ["scanpy/tests/_images"]
+testpaths = ["./tests", "scanpy"]
+norecursedirs = ["tests/_images"]
 xfail_strict = true
 nunit_attach_on = "fail"
 markers = [
@@ -206,7 +203,7 @@ filterwarnings = [
 [tool.coverage.run]
 data_file = "test-data/coverage"
 source_pkgs = ["scanpy"]
-omit = ["scanpy/tests/*", "src/testing/*"]
+omit = ["tests/*", "src/testing/*"]
 [tool.coverage.xml]
 output = "test-data/coverage.xml"
 [tool.coverage.paths]
@@ -219,6 +216,9 @@ exclude_also = [
     "@numba.njit.*",
 ]
 
+[tool.ruff]
+src = ["src"]
+
 [tool.ruff.format]
 docstring-code-format = true
 
@@ -247,7 +247,7 @@ ignore = [
 ]
 [tool.ruff.lint.per-file-ignores]
 # Do not assign a lambda expression, use a def
-"scanpy/tools/_rank_genes_groups.py" = ["E731"]
+"src/scanpy/tools/_rank_genes_groups.py" = ["E731"]
 [tool.ruff.lint.isort]
 known-first-party = ["scanpy", "testing.scanpy"]
 required-imports = ["from __future__ import annotations"]

src/scanpy/_utils/compute/__init__.py

@@ -34,7 +34,7 @@ def adata():
     from sklearn.datasets import make_blobs
 
     empty_pixel = np.array([1.0, 1.0, 1.0, 0]).reshape(1, 1, -1)
-    image = imread(HERE.parent.parent / "docs/_static/img/Scanpy_Logo_RGB.png")
+    image = imread(HERE.parent / "docs/_static/img/Scanpy_Logo_RGB.png")
     x, y = np.where(np.logical_and.reduce(~np.equal(image, empty_pixel), axis=2))
 
     # Just using to calculate the hex coords