From 05aa52ca0ff6b77a44fc984ce7787ee414efe1c6 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Thu, 25 Dec 2025 11:11:16 +0100
Subject: [PATCH 1/2] Drop pylint

---
 .github/workflows/ci.yml | 15 ---------------
 .gitlab-ci.yml           | 11 -----------
 .pylintrc-local.yml      |  7 -------
 pyproject.toml           |  1 -
 run-pylint.sh            | 23 -----------------------
 5 files changed, 57 deletions(-)
 delete mode 100644 .pylintrc-local.yml
 delete mode 100755 run-pylint.sh

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6e68ee0a..b04acb30 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -44,21 +44,6 @@ jobs:
                 pip install cffconvert
                 cffconvert -i CITATION.cff --validate
 
-    pylint:
-        name: Pylint
-        runs-on: ubuntu-latest
-        steps:
-        -   uses: actions/checkout@v6
-        -
-            uses: actions/setup-python@v6
-            with:
-                python-version: '3.x'
-        -   name: "Main Script"
-            run: |
-                EXTRA_INSTALL="numpy pymbolic orderedsets optype"
-                curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/prepare-and-run-pylint.sh
-                . ./prepare-and-run-pylint.sh "$(basename $GITHUB_REPOSITORY)"
-
     basedpyright:
         runs-on: ubuntu-latest
         steps:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fa8b961e..ea58d3cc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,17 +50,6 @@ Ruff:
   except:
   - tags
 
-Pylint:
-  script: |
-    EXTRA_INSTALL="numpy pymbolic orderedsets siphash24 optype"
-    py_version=3
-    curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/prepare-and-run-pylint.sh
-    . ./prepare-and-run-pylint.sh "$CI_PROJECT_NAME"
-  tags:
-  - python3
-  except:
-  - tags
-
 Documentation:
   script: |
     EXTRA_INSTALL="numpy siphash24 optype"
diff --git a/.pylintrc-local.yml b/.pylintrc-local.yml
deleted file mode 100644
index e045e85c..00000000
--- a/.pylintrc-local.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-- arg: ignore
-  val:
-    - mpiwrap.py
-- arg: ignored-modules
-  val:
-  - matplotlib
-  - siphash24
diff --git a/pyproject.toml b/pyproject.toml
index f3b80f89..7a339879 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -118,7 +118,6 @@ exclude = [
     ".conda-root",
     "build",
     ".env",
-    ".run-pylint.py",
 ]
 
 # This reports even cycles that are qualified by 'if TYPE_CHECKING'. Not what
diff --git a/run-pylint.sh b/run-pylint.sh
deleted file mode 100755
index 30dbe83e..00000000
--- a/run-pylint.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-set -o errexit -o nounset
-
-ci_support="https://gitlab.tiker.net/inducer/ci-support/raw/main"
-
-if [[ ! -f .pylintrc.yml ]]; then
-    curl -o .pylintrc.yml "${ci_support}/.pylintrc-default.yml"
-fi
-
-
-if [[ ! -f .run-pylint.py ]]; then
-    curl -L -o .run-pylint.py "${ci_support}/run-pylint.py"
-fi
-
-
-PYLINT_RUNNER_ARGS="--jobs=4 --yaml-rcfile=.pylintrc.yml"
-
-if [[ -f .pylintrc-local.yml ]]; then
-    PYLINT_RUNNER_ARGS+=" --yaml-rcfile=.pylintrc-local.yml"
-fi
-
-PYTHONWARNINGS=ignore python .run-pylint.py $PYLINT_RUNNER_ARGS pytools  examples "$@"

From 2356690a7cd407e2393b61655eb7d636224a03ec Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Thu, 25 Dec 2025 11:14:32 +0100
Subject: [PATCH 2/2] Fix: DTypeLike can't be None

---
 pytools/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pytools/__init__.py b/pytools/__init__.py
index b9d4f27f..28c25917 100644
--- a/pytools/__init__.py
+++ b/pytools/__init__.py
@@ -2315,7 +2315,7 @@ def add_python_path_relative_to_script(rel_path: str) -> None:
 # {{{ numpy dtype mangling
 
 def common_dtype(dtypes: Iterator[DTypeLike],
-                 default: DTypeLike = None) -> np.dtype[Any]:
+                 default: DTypeLike | None = None) -> np.dtype[Any]:
     import numpy as np
 
     ddtypes = [np.dtype(dtype) for dtype in dtypes]