Specify how meson discovers dependencies

.github/workflows/pythonpackage.yml

@@ -18,6 +18,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: astral-sh/setup-uv@v7
         with:
+          enable-cache: true
           python-version: ${{ matrix.python-version }}
       - run: uv sync
       - uses: astral-sh/ruff-action@v3

aoc2024/day12.py

@@ -15,14 +15,14 @@ class Side(IntFlag):
 
 m = len(lines)
 n = max(map(len, lines))
-regions: list[list[int | None]] = [[None] * len(line) for line in lines]
+regions = [[-1] * len(line) for line in lines]
 
 areas: list[int] = []
 
 k = 0
 for i, (line, region) in enumerate(zip(lines, regions)):
     for j, (crop, cell) in enumerate(zip(line, region)):
-        if cell is None:
+        if cell < 0:
             k = len(areas)
             area = 0
             q = [(i, j)]
@@ -31,7 +31,7 @@ class Side(IntFlag):
                 if (
                     0 <= s < m
                     and 0 <= t < n
-                    and regions[s][t] is None
+                    and regions[s][t] < 0
                     and lines[s][t] == crop
                 ):
                     area += 1

fourt2py/meson.build

@@ -21,22 +21,16 @@ fourt2py_source = custom_target('fourt2pymodule.c',
     command: [py, '-m', 'numpy.f2py', '@INPUT@', '--build-dir', '@OUTDIR@'],
 )
 
-incdir_numpy = run_command(py,
-    ['-c', 'import numpy.f2py; print(numpy.get_include())'],
+include_directories = run_command(py,
+    ['-c', 'import numpy.f2py; print(numpy.get_include(), numpy.f2py.get_include())'],
     check : true
-).stdout().strip()
-
-incdir_f2py = run_command(py,
-    ['-c', 'import numpy.f2py; print(numpy.f2py.get_include())'],
-    check : true
-).stdout().strip()
+).stdout().split()
 
 py.extension_module('fourt2py',
     'FOURT.F',
     fourt2py_source,
-    incdir_f2py / 'fortranobject.c',
-    dependencies : [py.dependency(), dependency('numpy')],
-    include_directories : include_directories(incdir_numpy, incdir_f2py),
+    include_directories[1] / 'fortranobject.c',
+    include_directories : include_directories,
     install : true,
     link_language : 'fortran',
 )

fun/prechelt.py

@@ -48,11 +48,11 @@ def aho_corasick(*words):
         for digit in map(int, word.translate(MAP)):
             next = node[digit]
             if next is None:
-                node[digit] = next = [None] * WORD  # pyright: ignore[reportArgumentType, reportCallIssue]
+                node[digit] = next = [None] * WORD  # pyright: ignore[reportArgumentType, reportCallIssue]  # ty: ignore[invalid-assignment]
             node = next
         node.append(word)
 
-    root[FAIL] = root  # pyright: ignore[reportArgumentType, reportCallIssue]
+    root[FAIL] = root  # pyright: ignore[reportArgumentType, reportCallIssue]  # ty: ignore[invalid-assignment]
     stack = []
     append = stack.append
     for node in root[:FAIL]:

sudoku/bitsudoku.py

@@ -32,7 +32,7 @@ def propagate(
     while np.equal(count, 1, out=where).any():  # pyright: ignore[reportArgumentType, reportCallIssue]  # ty: ignore[no-matching-overload]
         k = np.invert(possible[where])  # pyright: ignore[reportArgumentType, reportCallIssue]  # ty: ignore[invalid-argument-type]
         # ufunc.at performs *unbuffered* in place operation
-        np.bitwise_and.at(possible, tuple(_neighbors[:, where, :]),  # pyright: ignore[reportArgumentType, reportCallIssue]
+        np.bitwise_and.at(possible, tuple(_neighbors[:, where, :]),  # pyright: ignore[reportArgumentType, reportCallIssue]  # ty: ignore[invalid-argument-type]
                           k[:, np.newaxis])
         if not _counts.take(possible, out=count).all():  # stay in sync
             return -1