From 59dfc7c6a944a73005ca6f44b513f4758f9cf602 Mon Sep 17 00:00:00 2001 From: mayeut Date: Wed, 19 Mar 2025 08:01:20 +0100 Subject: [PATCH 1/2] fix: remove unused options from pytest coverage is removed altogether as it's not working --- .coveragerc | 7 ------- pyproject.toml | 10 ++-------- 2 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 .coveragerc diff --git a/.coveragerc b/.coveragerc deleted file mode 100644 index c5c3cac..0000000 --- a/.coveragerc +++ /dev/null @@ -1,7 +0,0 @@ -[run] -branch = True -include = ninja/*.py -omit = ninja/_version.py - -[xml] -output = tests/coverage.xml diff --git a/pyproject.toml b/pyproject.toml index 8880d90..b7fafe2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -36,9 +36,7 @@ requires-python = ">=3.7" [project.optional-dependencies] test = [ - "coverage>=4.2", "importlib_metadata>=2.0", - "pytest-cov>=3", "pytest>=6.0", ] @@ -129,10 +127,10 @@ test-command = "pip check" [tool.pytest.ini_options] minversion = "6.0" -addopts = ["-ra", "--strict-markers", "--strict-config"] +addopts = ["-ra", "--strict-markers", "--strict-config", "-v"] xfail_strict = true filterwarnings = ["error"] -log_cli_level = "info" +log_cli_level = "INFO" testpaths = [ "tests" ] @@ -178,7 +176,3 @@ flake8-unused-arguments.ignore-variadic-names = true [tool.ruff.lint.per-file-ignores] "*.pyi" = ["ARG001"] - -[tool.pytest.ini_config] -testpaths = ["tests"] -addopts = ["-v", "--cov", "--cov-report", "xml"] From 8bd1d6edbbea63633a99ee9de7568a3f1c68147e Mon Sep 17 00:00:00 2001 From: mayeut Date: Wed, 19 Mar 2025 08:02:47 +0100 Subject: [PATCH 2/2] fix: macOS build using nox With the move from scikit-build to scikit-build-core, the macOS build options need to be updated. --- noxfile.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/noxfile.py b/noxfile.py index 6392934..7bf5962 100644 --- a/noxfile.py +++ b/noxfile.py @@ -13,9 +13,7 @@ if sys.platform.startswith("darwin"): BUILD_ENV = { "MACOSX_DEPLOYMENT_TARGET": "10.9", - "CMAKE_OSX_ARCHITECTURES": "arm64;x86_64", - "CFLAGS": "-save-temps", - "CXXFLAGS": "-save-temps", + "ARCHFLAGS": "-arch arm64 -arch x86_64", } else: BUILD_ENV = {}