Miscellaneous updates

.flake8

@@ -1,8 +1,11 @@
 [flake8]
-ignore = W503
+ignore = W503,U101
 per-file-ignores =
   conf/*: D
   docs/*: D
   src/mpi4py/futures/_core.py: D,B036
   src/mpi4py/futures/aplus.py: B036
   src/mpi4py/futures/util.py: B036
+  src/mpi4py/typing.py: U100
+  src/mpi4py/util/pkl5.py: U100
+unused-arguments-ignore-variadic-names = True

.github/workflows/ci-check.yml

@@ -99,7 +99,7 @@ jobs:
       run:  python -m pip install -U -r conf/requirements-lint.txt
 
     - name: ruff
-      run:  ruff .
+      run:  ruff check .
 
     - name: flake8
       run:  flake8 docs src

.ruff.toml

@@ -20,6 +20,7 @@ lint.select = [
 "S",
 "W",
 "UP",
+"ARG",
 "ISC",
 "PIE",
 #"PTH",

.spin.toml

@@ -5,14 +5,12 @@ name = 'mpi4py'
 "Build" = [
   ".spin/cmds.py:build",
   ".spin/cmds.py:test",
-  ".spin/cmds.py:clean",
   ".spin/cmds.py:sdist",
   ".spin/cmds.py:wheel",
 ]
 "Environment" = [
   ".spin/cmds.py:shell",
   ".spin/cmds.py:ipython",
-  ".spin/cmds.py:exec",
   ".spin/cmds.py:mpiexec",
   ".spin/cmds.py:mpi4py",
 ]

.spin/cmds.py

@@ -14,8 +14,7 @@
 @click.option("-c", "--clean", is_flag=True, help="Clean build directory.")
 @click.option("-f", "--force", is_flag=True, help="Force build everything.")
 @click.option("-q", "--quiet", is_flag=True, help="Run quietly.")
-@click.pass_context
-def build(ctx, clean, force, quiet):
+def build(clean, force, quiet):
     """🔧 Build in-place."""
     opt_force = ["--force"] if force else []
     opt_quiet = ["--quiet"] if quiet else []
@@ -36,14 +35,6 @@ def test(ctx, n, singleton, test_args):
     run([*launcher, *PYTHON, "test/main.py", "--inplace", *test_args])
 
 
-@click.command()
-@click.option("-q", "--quiet", is_flag=True, help="Run quietly.")
-def clean(quiet):
-    """🔧 Clean build directory."""
-    opt_quiet = ["--quiet"] if quiet else []
-    run([*PYTHON, "setup.py", *opt_quiet, "clean", "--all"])
-
-
 def _get_site_packages():
     script = os.path.abspath(__file__)
     testdir = os.path.dirname(script)
@@ -91,15 +82,6 @@ def ipython(ctx, ipython_args):
     run([*ipython, *ipython_args], replace=True)
 
 
-@click.command(context_settings={"ignore_unknown_options": True})
-@click.argument("args", nargs=-1)
-@click.pass_context
-def exec(ctx, args):
-    """🏁 Run command with PYTHONPATH set."""
-    _setup_environment(ctx)
-    run([*args], replace=True)
-
-
 @click.command(context_settings={"ignore_unknown_options": True})
 @click.option("-n", default=1, help="Number of MPI processes")
 @click.argument("mpiexec_args", nargs=-1)
@@ -141,7 +123,7 @@ def install(editable, quiet, pip_args):
 @click.option("-q", "--quiet", is_flag=True, help="Run quietly.")
 @click.argument("pip_args", nargs=-1)
 @click.pass_context
-def editable(ctx, quiet, pip_args):
+def editable(ctx, quiet, pip_args):  # noqa: ARG001
     """🔧 Install package in editable mode."""
     ctx.forward(install, editable=True)
 

conf/cycoverage.py

@@ -170,7 +170,7 @@ def line_is_excluded(_):
     return code_lines, exec_lines, excluded_lines
 
 
-def coverage_init(reg, options):
+def coverage_init(reg, options):  # noqa: ARG001
     plugin = CythonCoveragePlugin()
     reg.add_configurer(plugin)
     reg.add_file_tracer(plugin)

conf/metadata.py

@@ -3,15 +3,15 @@
 import sys
 
 
-def get_name(settings=None):
+def get_name(settings=None):  # noqa: ARG001
     name = "mpi4py"
     suffix = os.environ.get("MPI4PY_DIST_SUFFIX")
     if suffix:
         name = "{name}-{suffix}".format(**vars())
     return name
 
 
-def get_version(settings=None):
+def get_version(settings=None):  # noqa: ARG001
     confdir = os.path.dirname(os.path.abspath(__file__))
     topdir = os.path.dirname(confdir)
     srcdir = os.path.join(topdir, "src")
@@ -25,7 +25,7 @@ def get_version(settings=None):
     return version
 
 
-def get_readme(settings=None):
+def get_readme(settings=None):  # noqa: ARG001
     confdir = os.path.dirname(__file__)
     topdir = os.path.dirname(confdir)
     filelist = ("DESCRIPTION.rst", "CITATION.rst", "INSTALL.rst")

conf/mpidistutils.py

@@ -648,6 +648,8 @@ def cython_run(
     args = []
     if with_coverage():
         args += ['-X', 'linetrace=True']
+    if includes:
+        args += [f'-I{incdir}' for incdir in includes]
     if workdir:
         args += ['--working', workdir]
     args += [source]
@@ -948,7 +950,7 @@ def configure_mpi(ext, config_cmd):
         configure_dl(ext, config_cmd)
 
 
-def configure_pyexe(exe, config_cmd):
+def configure_pyexe(exe, _config_cmd):
     if sys.platform.startswith('win'):
         return
     if (sys.platform == 'darwin' and
@@ -1027,7 +1029,7 @@ def has_executables (self):
         return self.distribution.has_executables()
 
     sub_commands = [
-        ('build_src', lambda *args: True),
+        ('build_src', lambda *_: True),
          *cmd_build.build.sub_commands,
         ('build_exe', has_executables),
     ]

conf/mpistubgen.py

@@ -506,7 +506,7 @@ def Intersect(cls, group1: Group, group2: Group) -> Self: ...
 """
 
 
-def visit_mpi4py_MPI(done=None):
+def visit_mpi4py_MPI():
     from mpi4py import MPI as module
     lines = Lines()
     lines.add = IMPORTS

conf/requirements-lint.txt

@@ -5,6 +5,7 @@ flake8-assertive
 flake8-bandit
 flake8-bugbear
 flake8-docstrings
+flake8-unused-arguments
 flake8-use-fstring
 pylint
 ruff

docs/source/apidoc.py

@@ -492,7 +492,7 @@ def _def(cls, name):
 """
 
 
-def visit_mpi4py_MPI(done=None):
+def visit_mpi4py_MPI():
     from mpi4py import MPI as module
     lines = Lines()
     lines.add = f'"""{module.__doc__}"""'

docs/source/conf.py

@@ -212,7 +212,7 @@ class TypeDocumenter(autodoc.DataDocumenter):
         priority = autodoc.ClassDocumenter.priority + 1
 
         @classmethod
-        def can_document_member(cls, member, membername, isattr, parent):
+        def can_document_member(cls, member, _membername, _isattr, parent):
             return (
                 isinstance(parent, autodoc.ModuleDocumenter)
                 and parent.name == 'mpi4py.typing'

src/mpi4py/futures/aplus.py

@@ -82,7 +82,7 @@ def catch(future, on_failure=None):
 
     """
     if on_failure is None:
-        return then(future, None, lambda exc: None)
+        return then(future, None, lambda _: None)
     return then(future, None, on_failure)
 
 

src/mpi4py/util/pkl5.py

@@ -674,7 +674,7 @@ def recv(self,
         return _recv(self, MPI.Comm.Recv, buf, source, tag, status)
 
     def irecv(self,
-              buf=None, source=ANY_SOURCE, tag=ANY_TAG):
+              buf=None, source=ANY_SOURCE, tag=ANY_TAG):  # noqa: ARG002
         """Nonblocking receive."""
         raise RuntimeError("unsupported")
 

test/test_errorcode.py

@@ -30,6 +30,9 @@ def testException(self):
             errstr = MPI.Get_error_string(ierr)
             errcls = MPI.Get_error_class(ierr)
             errexc = MPI.Exception(ierr)
+            self.assertEqual(errexc.Get_error_code(),   ierr)
+            self.assertEqual(errexc.Get_error_class(),  errcls)
+            self.assertEqual(errexc.Get_error_string(), errstr)
             self.assertEqual(errexc.error_code,   ierr)
             self.assertEqual(errexc.error_class,  errcls)
             self.assertEqual(errexc.error_string, errstr)

test/test_exceptions.py

@@ -43,6 +43,9 @@ def assertRaisesMPI(self, IErrClass, callableObj, *args, **kwargs):
             raise
         except excClass as excValue:
             error_class = excValue.Get_error_class()
+        else:
+            error_class = None
+        if error_class is not None:
             if isinstance(IErrClass, (list, tuple, set)):
                 match = (error_class in IErrClass)
             else:

test/test_grequest.py

@@ -63,7 +63,7 @@ def check_exc(exception, is_mpi, stderr):
             else:
                 chkcode = MPI.ERR_OTHER
                 excname = ValueError.__name__
-            ierr = exception.Get_error_code()
+            ierr = exception.Get_error_class()
             self.assertEqual(ierr, chkcode)
             self.assertTrue(output.startswith(header))
             self.assertIn(excname, output)

tox.ini

@@ -132,7 +132,7 @@ setenv =
     MPICFG=nompi-fast
     CFLAGS=-O0
 commands =
-    ruff .
+    ruff check .
     flake8 docs src
     flake8 --select=A {toxinidir}/test
     pylint mpi4py