Use select vs extend-select in ruff config

.github/workflows/ci.yml

@@ -106,23 +106,6 @@ jobs:
                 curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project.sh
                 . ./build-and-test-py-project.sh
 
-    #examples:
-    #    name: Examples Py3
-    #    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"
-    #            curl -L -O https://tiker.net/ci-support-v0
-    #            . ./ci-support-v0
-    #            build_py_project_in_venv
-    #            run_examples
-
     downstream_tests:
         strategy:
             matrix:

.gitlab-ci.yml

@@ -29,18 +29,6 @@ Pytest without Numpy:
     reports:
       junit: test/pytest.xml
 
-# Examples:
-#   script: |
-#     EXTRA_INSTALL="numpy pymbolic"
-#     curl -L -O https://tiker.net/ci-support-v0
-#     . ./ci-support-v0
-#     build_py_project_in_venv
-#     run_examples
-#   tags:
-#   - python3
-#   except:
-#   - tags
-
 Ruff:
   script: |
     pipx install ruff

pyproject.toml

@@ -62,7 +62,7 @@ exclude = [
 preview = true
 
 [tool.ruff.lint]
-extend-select = [
+select = [
     "B",   # flake8-bugbear
     "C",   # flake8-comprehensions
     "E",   # pycodestyle

pytools/__init__.py

@@ -508,11 +508,8 @@ def register_fields(self, new_fields):
         fields.update(new_fields)
 
     def __getattr__(self, name):
-        # This method is implemented to avoid pylint 'no-member' errors for
-        # attribute access.
         raise AttributeError(
-                "'{}' object has no attribute '{}'".format(
-                    self.__class__.__name__, name))
+                f"'{self.__class__.__name__}' object has no attribute '{name}'")
 
 
 class Record(RecordWithoutPickling):
@@ -629,9 +626,10 @@ def copy(self) -> DependentDictionary[T, R]:
     def __contains__(self, key: T) -> bool:
         try:
             self[key]
-            return True
         except KeyError:
             return False
+        else:
+            return True
 
     def __getitem__(self, key: T) -> R:
         try:
@@ -1609,7 +1607,7 @@ def generate_all_integer_tuples_below(
         n, length, least_abs))
 
 
-class _ConcatenableSequence(Generic[T_co], Protocol):
+class _ConcatenableSequence(Protocol, Generic[T_co]):
     """
     A protocol that supports the following:
 
@@ -2185,9 +2183,7 @@ def invoke_editor(s: str, filename: str = "edit.txt", descr: str = "the file"):
                 "dropped directly into an editor next time.)")
         input(f"Edit {descr} at {full_path} now, then hit [Enter]:")
 
-    result = full_path.read_text()
-
-    return result
+    return full_path.read_text()
 
 # }}}
 

pytools/debug.py

@@ -124,8 +124,8 @@ def is_excluded(o):
                 print("type expression, obj is your object:")
                 expr_str = input()
                 try:
-                    res = eval(expr_str, {"obj": r})  # pylint:disable=eval-used
-                except Exception:  # pylint:disable=broad-except
+                    res = eval(expr_str, {"obj": r})
+                except Exception:
                     from traceback import print_exc
                     print_exc()
                 print(res)
@@ -156,7 +156,7 @@ def setup_readline():
     if exists(hist_filename):
         try:
             readline.read_history_file(hist_filename)
-        except Exception:  # pylint:disable=broad-except
+        except Exception:
             # http://docs.python.org/3/howto/pyporting.html#capturing-the-currently-raised-exception
             import sys
             e = sys.exc_info()[1]

pytools/mpiwrap.py

@@ -1,14 +1,14 @@
 """See pytools.prefork for this module's reason for being."""
 from __future__ import annotations
 
-import mpi4py.rc  # pylint:disable=import-error
+import mpi4py.rc
 
 
 mpi4py.rc.initialize = False
 
-from mpi4py.MPI import *  # noqa: F403 pylint:disable=wildcard-import,wrong-import-position
+from mpi4py.MPI import *  # noqa: F403
 
-import pytools.prefork  # pylint:disable=wrong-import-position
+import pytools.prefork
 
 
 pytools.prefork.enable_prefork()

pytools/prefork.py

@@ -194,7 +194,7 @@ def _fork_server(sock: socket.socket) -> None:
             try:
                 result = funcs[func_name](*args, **kwargs)
             # FIXME: Is catching all exceptions the right course of action?
-            except Exception as e:  # pylint:disable=broad-except
+            except Exception as e:
                 _send_packet(sock, ("exception", e))
             else:
                 _send_packet(sock, ("ok", result))

pytools/test/test_dataclasses.py

@@ -53,13 +53,13 @@ class A:
     else:
         a.x = 2
 
-    assert a.__dataclass_params__.frozen is __debug__  # pylint: disable=no-member
+    assert a.__dataclass_params__.frozen is __debug__
 
     # }}}
 
     with pytest.raises(TypeError):
         # Can't specify frozen parameter
-        @opt_frozen_dataclass(frozen=False)  # pylint: disable=unexpected-keyword-arg
+        @opt_frozen_dataclass(frozen=False)
         class B:
             x: int
 

pytools/test/test_pytools.py

@@ -416,7 +416,7 @@ def __getitem__(self, idx):
 def test_make_obj_array_iteration():
     pytest.importorskip("numpy")
 
-    import pytools.obj_array as obj_array
+    from pytools import obj_array
     obj_array.new_1d([FakeArray()])
 
     assert FakeArray.nopes == 0, FakeArray.nopes
@@ -430,7 +430,7 @@ def test_obj_array_vectorize(c=1):
     np = pytest.importorskip("numpy")
     la = pytest.importorskip("numpy.linalg")
 
-    import pytools.obj_array as obj_array
+    from pytools import obj_array
 
     # {{{ functions