diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 7d59053..f8ade8f 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -111,7 +111,7 @@ jobs: CIBW_TEST_EXTRAS: "test" # run tests - CIBW_TEST_COMMAND: "pytest {project}/suitesparse_graphblas/tests" + CIBW_TEST_COMMAND: "pytest --pyargs suitesparse_graphblas" # GitHub Actions macOS Intel runner cannot run ARM tests. CIBW_TEST_SKIP: "*-macosx_arm64" diff --git a/MANIFEST.in b/MANIFEST.in index c2e230d..61cd04d 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -6,4 +6,3 @@ include suitesparse_graphblas/*.pxd include suitesparse_graphblas/*.pyx include suitesparse_graphblas/*.c include suitesparse_graphblas/*.h -include suitesparse_graphblas/tests/*.py diff --git a/pyproject.toml b/pyproject.toml index beccc7a..1a5d5fd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -61,7 +61,7 @@ test = [ [tool.setuptools] packages = [ 'suitesparse_graphblas', - # 'suitesparse_graphblas.tests', + 'suitesparse_graphblas.tests', 'suitesparse_graphblas.io', ] diff --git a/suitesparse.sh b/suitesparse.sh index 72d805f..26b29fb 100755 --- a/suitesparse.sh +++ b/suitesparse.sh @@ -52,15 +52,15 @@ cd GraphBLAS-${VERSION}/build # echo "#define GxB_NO_BOOL 1" >> ../Source/GB_control.h # # echo "#define GxB_NO_FP32 1" >> ../Source/GB_control.h # # echo "#define GxB_NO_FP64 1" >> ../Source/GB_control.h # -echo "#define GxB_NO_FC32 1" >> ../Source/GB_control.h # -echo "#define GxB_NO_FC64 1" >> ../Source/GB_control.h # -# echo "#define GxB_NO_INT16 1" >> ../Source/GB_control.h -# echo "#define GxB_NO_INT32 1" >> ../Source/GB_control.h +echo "#define GxB_NO_FC32 1" >> ../Source/GB_control.h +echo "#define GxB_NO_FC64 1" >> ../Source/GB_control.h +# echo "#define GxB_NO_INT16 1" >> ../Source/GB_control.h # +# echo "#define GxB_NO_INT32 1" >> ../Source/GB_control.h # # echo "#define GxB_NO_INT64 1" >> ../Source/GB_control.h # -# echo "#define GxB_NO_INT8 1" >> ../Source/GB_control.h +# echo "#define GxB_NO_INT8 1" >> ../Source/GB_control.h # echo "#define GxB_NO_UINT16 1" >> ../Source/GB_control.h echo "#define GxB_NO_UINT32 1" >> ../Source/GB_control.h -# echo "#define GxB_NO_UINT64 1" >> ../Source/GB_control.h +# echo "#define GxB_NO_UINT64 1" >> ../Source/GB_control.h # echo "#define GxB_NO_UINT8 1" >> ../Source/GB_control.h # Disable all Source/Generated2 kernels. For workflow development only. diff --git a/suitesparse_graphblas/tests/__init__.py b/suitesparse_graphblas/tests/__init__.py new file mode 100644 index 0000000..e69de29