feat: rewrite

Signed-off-by: Henry Schreiner <[email protected]>

Author: henryiii

.github/CONTRIBUTING.md

@@ -66,14 +66,6 @@ Use pytest to run the unit checks:
 pytest
 ```
 
-# Coverage
-
-Use pytest-cov to generate coverage reports:
-
-```bash
-pytest --cov=cython-cmake
-```
-
 # Building docs
 
 You can build the docs using:

.github/workflows/ci.yml

@@ -57,13 +57,10 @@ jobs:
           python-version: ${{ matrix.python-version }}
           allow-prereleases: true
 
+      - uses: yezz123/setup-uv@v4
+
       - name: Install package
-        run: python -m pip install .[test]
+        run: uv pip install --system -e.[test]
 
       - name: Test package
-        run: >-
-          python -m pytest -ra --cov --cov-report=xml --cov-report=term
-          --durations=20
-
-      - name: Upload coverage report
-        uses: codecov/[email protected]
+        run: python -m pytest --durations=20

.pre-commit-config.yaml

@@ -55,6 +55,7 @@ repos:
         args: []
         additional_dependencies:
           - pytest
+          - scikit-build-core
 
   - repo: https://github.com/codespell-project/codespell
     rev: "v2.3.0"

noxfile.py

@@ -1,13 +1,14 @@
 from __future__ import annotations
 
 import argparse
-import shutil
 from pathlib import Path
 
 import nox
 
 DIR = Path(__file__).parent.resolve()
 
+nox.needs_version = ">=2024.3.2"
+nox.options.default_venv_backend = "uv|virtualenv"
 nox.options.sessions = ["lint", "pylint", "tests"]
 
 
@@ -38,7 +39,7 @@ def tests(session: nox.Session) -> None:
     """
     Run the unit and regular tests.
     """
-    session.install(".[test]")
+    session.install("-e.[test]")
     session.run("pytest", *session.posargs)
 
 
@@ -109,9 +110,5 @@ def build(session: nox.Session) -> None:
     Build an SDist and wheel.
     """
 
-    build_path = DIR.joinpath("build")
-    if build_path.exists():
-        shutil.rmtree(build_path)
-
     session.install("build")
     session.run("python", "-m", "build")

pyproject.toml

@@ -38,11 +38,8 @@ any = "cython_cmake.cmake"
 [project.optional-dependencies]
 test = [
   "pytest >=6",
-  "pytest-cov >=3",
-]
-dev = [
-  "pytest >=6",
-  "pytest-cov >=3",
+  "scikit-build-core",
+  "cython",
 ]
 docs = [
   "sphinx>=7.0",
@@ -64,9 +61,11 @@ version.source = "vcs"
 build.hooks.vcs.version-file = "src/cython_cmake/_version.py"
 
 [tool.hatch.envs.default]
-features = ["test"]
-scripts.test = "pytest {args}"
+installer = "uv"
 
+[tool.hatch.envs.hatch-test]
+features = ["test"]
+extra-dependencies = ["cmake", "ninja"]
 
 [tool.pytest.ini_options]
 minversion = "6.0"

src/cython_cmake/cmake/FindCython.cmake

@@ -13,6 +13,11 @@
 #  ``CYTHON_FOUND``
 #    true if the program was found
 #
+# And the following target:
+#
+#  ``Cython::Cython``
+#    The Cython executable
+#
 # For more information on the Cython project, see https://cython.org/.
 #
 # *Cython is a language that makes writing C extensions for the Python language
@@ -34,6 +39,10 @@
 # limitations under the License.
 #=============================================================================
 
+if(CMAKE_VERSION VERSION_LESS "3.20")
+  message(SEND_ERROR "CMake 3.20 required")
+endif()
+
 # Use the Cython executable that lives next to the Python executable
 # if it is a local installation.
 if(Python_EXECUTABLE)
@@ -56,7 +65,7 @@ else()
 endif()
 
 if(CYTHON_EXECUTABLE)
-  set(CYTHON_version_command ${CYTHON_EXECUTABLE} --version)
+  set(CYTHON_version_command "${CYTHON_EXECUTABLE}" --version)
 
   execute_process(COMMAND ${CYTHON_version_command}
                   OUTPUT_VARIABLE CYTHON_version_output
@@ -69,20 +78,31 @@ if(CYTHON_EXECUTABLE)
     set(_error_msg "Command \"${CYTHON_version_command}\" failed with")
     set(_error_msg "${_error_msg} output:\n${CYTHON_version_error}")
     message(SEND_ERROR "${_error_msg}")
+  elseif("${CYTHON_version_output}" MATCHES "^[Cc]ython version ([^,]+)")
+    set(CYTHON_VERSION "${CMAKE_MATCH_1}")
+  elseif("${CYTHON_version_error}" MATCHES "^[Cc]ython version ([^,]+)")
+    set(CYTHON_VERSION "${CMAKE_MATCH_1}")
   else()
-    if("${CYTHON_version_output}" MATCHES "^[Cc]ython version ([^,]+)")
-      set(CYTHON_VERSION "${CMAKE_MATCH_1}")
-    else()
-      if("${CYTHON_version_error}" MATCHES "^[Cc]ython version ([^,]+)")
-        set(CYTHON_VERSION "${CMAKE_MATCH_1}")
-      endif()
-    endif()
+    message(SEND_ERROR "Invalid Cython version output")
   endif()
 endif()
 
 include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Cython REQUIRED_VARS CYTHON_EXECUTABLE)
+find_package_handle_standard_args(Cython
+  REQUIRED_VARS CYTHON_EXECUTABLE
+  VERSION_VAR ${CYTHON_VERSION}
+  HANDLE_VERSION_RANGE
+)
 
-mark_as_advanced(CYTHON_EXECUTABLE)
+if(CYTHON_FOUND)
+  if(NOT DEFINED Cython::Cython)
+    add_executable(Cython::Cython IMPORTED)
+    set_target_properties(Cython::Cython PROPERTIES
+        IMPORTED_LOCATION "${CYTHON_EXECUTABLE}"
+    )
+  endif()
+
+  include(UseCython)
+endif()
 
-include(UseCython)
+mark_as_advanced(CYTHON_EXECUTABLE)