Skip to content

Commit 49acb10

Browse files
authored
Test against graphblas 7.3.3 (#57)
* Test against graphblas 7.3.3 * Make flake8 happy * oops * I like this better (add newline to end of generated files)
1 parent 95d5fdc commit 49acb10

10 files changed

+15
-16
lines changed

.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
# os: ["ubuntu-latest"]
2020
# source: ["source"]
2121
python-version: ["3.8", "3.9", "3.10", "3.11"]
22-
graphblas-version: ["7.3.2"]
22+
graphblas-version: ["7.3.3"]
2323
steps:
2424
- name: Checkout
2525
uses: actions/checkout@v3

setup.cfg

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ max-line-length = 100
66
inline-quotes = "
77
exclude =
88
versioneer.py,
9-
ignore =
10-
E203, # whitespace before ':'
11-
E231, # Multiple spaces around ","
12-
W503, # line break before binary operator
9+
extend-ignore =
10+
E203,
11+
# E203 whitespace before ':' (to be compatible with black)
12+
per-file-ignores = suitesparse_graphblas/io/binary.py:C408
1313
1414
[coverage:run]
1515
source = suitesparse_graphblas

suitesparse_graphblas/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from . import _version
22
from . import exceptions as ex
33
from . import utils
4-
from ._graphblas import ffi, lib # noqa
4+
from ._graphblas import ffi, lib
55

66
import struct
77
import platform

suitesparse_graphblas/create_headers.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -824,7 +824,7 @@ def main():
824824
groups = parse_header(processed_h, skip_complex=False)
825825
text = create_header_text(groups)
826826
with open(final_h, "w") as f:
827-
f.write("\n".join(text))
827+
f.write("\n".join(text) + "\n")
828828

829829
# Create final header file (arm64)
830830
# Replace all variadic arguments (...) with "char *"
@@ -833,20 +833,20 @@ def main():
833833
patt = re.compile(r"^(extern GrB_Info .*\(.*)(\.\.\.)(\);)$")
834834
text = [patt.sub(r"\1char *\3", line) for line in orig_text]
835835
with open(final_arm64_h, "w") as f:
836-
f.write("\n".join(text))
836+
f.write("\n".join(text) + "\n")
837837

838838
# Create final header file (no complex)
839839
print(f"Step 5: parse header file to create {final_no_complex_h}")
840840
groups_no_complex = parse_header(processed_h, skip_complex=True)
841841
text = create_header_text(groups_no_complex)
842842
with open(final_no_complex_h, "w") as f:
843-
f.write("\n".join(text))
843+
f.write("\n".join(text) + "\n")
844844

845845
# Create source
846846
print(f"Step 6: create {source_c}")
847847
text = create_source_text(groups)
848848
with open(source_c, "w") as f:
849-
f.write("\n".join(text))
849+
f.write("\n".join(text) + "\n")
850850

851851
# Check defines
852852
print("Step 7: check #define definitions")

suitesparse_graphblas/source.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ char *GxB_IMPLEMENTATION_DATE_STR = GxB_IMPLEMENTATION_DATE;
55
char *GxB_IMPLEMENTATION_LICENSE_STR = GxB_IMPLEMENTATION_LICENSE;
66
char *GxB_IMPLEMENTATION_NAME_STR = GxB_IMPLEMENTATION_NAME;
77
char *GxB_SPEC_ABOUT_STR = GxB_SPEC_ABOUT;
8-
char *GxB_SPEC_DATE_STR = GxB_SPEC_DATE;
8+
char *GxB_SPEC_DATE_STR = GxB_SPEC_DATE;

suitesparse_graphblas/suitesparse_graphblas.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -3466,4 +3466,4 @@ extern char *GxB_IMPLEMENTATION_DATE_STR;
34663466
extern char *GxB_IMPLEMENTATION_LICENSE_STR;
34673467
extern char *GxB_IMPLEMENTATION_NAME_STR;
34683468
extern char *GxB_SPEC_ABOUT_STR;
3469-
extern char *GxB_SPEC_DATE_STR;
3469+
extern char *GxB_SPEC_DATE_STR;

suitesparse_graphblas/suitesparse_graphblas_arm64.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -3466,4 +3466,4 @@ extern char *GxB_IMPLEMENTATION_DATE_STR;
34663466
extern char *GxB_IMPLEMENTATION_LICENSE_STR;
34673467
extern char *GxB_IMPLEMENTATION_NAME_STR;
34683468
extern char *GxB_SPEC_ABOUT_STR;
3469-
extern char *GxB_SPEC_DATE_STR;
3469+
extern char *GxB_SPEC_DATE_STR;

suitesparse_graphblas/suitesparse_graphblas_no_complex.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -3234,4 +3234,4 @@ extern char *GxB_IMPLEMENTATION_DATE_STR;
32343234
extern char *GxB_IMPLEMENTATION_LICENSE_STR;
32353235
extern char *GxB_IMPLEMENTATION_NAME_STR;
32363236
extern char *GxB_SPEC_ABOUT_STR;
3237-
extern char *GxB_SPEC_DATE_STR;
3237+
extern char *GxB_SPEC_DATE_STR;

suitesparse_graphblas/tests/test_io.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
if platform.system() == "Windows":
2525
pytest.skip("skipping windows-only tests", allow_module_level=True)
2626

27-
from suitesparse_graphblas.io import binary # noqa isort:skip
27+
from suitesparse_graphblas.io import binary # isort:skip
2828

2929
NULL = ffi.NULL
3030

suitesparse_graphblas/utils.pxd

-1
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,3 @@ cpdef ndarray claim_buffer_2d(
3838
)
3939

4040
cpdef unclaim_buffer(ndarray array)
41-

0 commit comments

Comments
 (0)