Merge pull request #188 from bluetech/ronny-changes-1

Ronny changes 1

.github/workflows/main.yml

@@ -6,8 +6,8 @@ on:
       - "master"
       - "test-me-*"
     tags:
-      - "[0-9]+.[0-9]+.[0-9]+"
-      - "[0-9]+.[0-9]+.[0-9]+rc[0-9]+"
+      - "v[0-9]+.[0-9]+.[0-9]+"
+      - "v[0-9]+.[0-9]+.[0-9]+rc[0-9]+"
 
   pull_request:
     branches:

.pre-commit-config.yaml

@@ -1,4 +1,3 @@
-exclude: doc/en/example/py2py3/test_py2.py
 repos:
 -   repo: https://github.com/codespell-project/codespell
     rev: v2.2.4

doc/example/sysinfo.py

@@ -6,7 +6,6 @@
 (c) Holger Krekel, MIT license
 """
 import optparse
-import pathlib
 import re
 import sys
 
@@ -34,12 +33,12 @@
 
 
 def parsehosts(path):
-    path = pathlib.Path(path)
+    host_regex = re.compile(r"Host\s*(\S+)")
     l = []
-    rex = re.compile(r"Host\s*(\S+)")
-    with path.open() as f:
-        for line in f:
-            m = rex.match(line)
+
+    with open(path) as fp:
+        for line in fp:
+            m = host_regex.match(line)
             if m is not None:
                 (sshname,) = m.groups()
                 l.append(sshname)
@@ -119,7 +118,7 @@ def getcpuinfo(self):
 
 
 def debug(*args):
-    print >> sys.stderr, " ".join(map(str, args))
+    print(" ".join(map(str, args)), file=sys.stderr)
 
 
 def error(*args):
@@ -140,7 +139,7 @@ def getinfo(sshname, ssh_config=None, loginfo=sys.stdout):
         ri = RemoteInfo(gw)
         # print "%s info:" % sshname
         prefix = sshname.upper() + " "
-        print >> loginfo, prefix, "fqdn:", ri.getfqdn()
+        print(prefix, "fqdn:", ri.getfqdn(), file=loginfo)
         for attr in ("sys.platform", "sys.version_info"):
             loginfo.write(f"{prefix} {attr}: ")
             loginfo.flush()
@@ -151,12 +150,12 @@ def getinfo(sshname, ssh_config=None, loginfo=sys.stdout):
         memswap = ri.getmemswap()
         if memswap:
             mem, swap = memswap
-            print >> loginfo, prefix, "Memory:", mem, "Swap:", swap
+            print(prefix, "Memory:", mem, "Swap:", swap, file=loginfo)
         cpuinfo = ri.getcpuinfo()
         if cpuinfo:
             numcpu, model = cpuinfo
-            print >> loginfo, prefix, "number of cpus:", numcpu
-            print >> loginfo, prefix, "cpu model", model
+            print(prefix, "number of cpus:", numcpu, file=loginfo)
+            print(prefix, "cpu model", model, file=loginfo)
         return ri
 
 

execnet/gateway_io.py

@@ -32,29 +32,12 @@ def kill(self):
 
 def killpopen(popen):
     try:
-        if hasattr(popen, "kill"):
-            popen.kill()
-        else:
-            killpid(popen.pid)
-    except OSError:
-        sys.stderr.write("ERROR killing: %s\n" % (sys.exc_info()[1]))
+        popen.kill()
+    except OSError as e:
+        sys.stderr.write("ERROR killing: %s\n" % e)
         sys.stderr.flush()
 
 
-def killpid(pid):
-    if hasattr(os, "kill"):
-        os.kill(pid, 15)
-    elif sys.platform == "win32" or getattr(os, "_name", None) == "nt":
-        import ctypes
-
-        PROCESS_TERMINATE = 1
-        handle = ctypes.windll.kernel32.OpenProcess(PROCESS_TERMINATE, False, pid)
-        ctypes.windll.kernel32.TerminateProcess(handle, -1)
-        ctypes.windll.kernel32.CloseHandle(handle)
-    else:
-        raise OSError(f"no method to kill {pid}")
-
-
 popen_bootstrapline = "import sys;exec(eval(sys.stdin.readline()))"
 
 
@@ -72,10 +55,8 @@ def shell_split_path(path):
 def popen_args(spec):
     args = shell_split_path(spec.python) if spec.python else [sys.executable]
     args.append("-u")
-    if spec is not None and spec.dont_write_bytecode:
+    if spec.dont_write_bytecode:
         args.append("-B")
-    # Slight gymnastics in ordering these arguments because CPython (as of
-    # 2.7.1) ignores -B if you provide `python -c "something" -B`
     args.extend(["-c", popen_bootstrapline])
     return args
 

pyproject.toml

@@ -55,3 +55,7 @@ version-file = "execnet/_version.py"
 include = [
     "/execnet",
 ]
+
+
+[tool.mypy]
+python_version = "3.7"

testing/conftest.py

@@ -1,7 +1,8 @@
-import pathlib
 import shutil
-import subprocess
 import sys
+from functools import lru_cache
+from typing import Callable
+from typing import Iterator
 
 import execnet
 import pytest
@@ -23,10 +24,15 @@ def pytest_runtest_setup(item):
 
 
 @pytest.fixture
-def makegateway(request):
+def group_function() -> Iterator[execnet.Group]:
     group = execnet.Group()
-    request.addfinalizer(lambda: group.terminate(0.5))
-    return group.makegateway
+    yield group
+    group.terminate(0.5)
+
+
+@pytest.fixture
+def makegateway(group_function) -> Callable[[str], execnet.gateway.Gateway]:
+    return group_function.makegateway
 
 
 pytest_plugins = ["pytester", "doctest"]
@@ -101,37 +107,16 @@ def pytest_generate_tests(metafunc):
         else:
             gwtypes = ["popen", "socket", "ssh", "proxy"]
         metafunc.parametrize("gw", gwtypes, indirect=True)
-    elif "anypython" in metafunc.fixturenames:
-        metafunc.parametrize(
-            "anypython",
-            indirect=True,
-            argvalues=("sys.executable", "pypy3"),
-        )
 
 
-def getexecutable(name, cache={}):
-    try:
-        return cache[name]
-    except KeyError:
-        if name == "sys.executable":
-            return pathlib.Path(sys.executable)
-        path = shutil.which(name)
-        executable = pathlib.Path(path) if path is not None else None
-        if executable:
-            if name == "jython":
-                popen = subprocess.Popen(
-                    [str(executable), "--version"],
-                    universal_newlines=True,
-                    stderr=subprocess.PIPE,
-                )
-                out, err = popen.communicate()
-                if not err or "2.5" not in err:
-                    executable = None
-        cache[name] = executable
-        return executable
+@lru_cache()
+def getexecutable(name):
+    if name == "sys.executable":
+        return sys.executable
+    return shutil.which(name)
 
 
-@pytest.fixture
+@pytest.fixture(params=("sys.executable", "pypy3"))
 def anypython(request):
     name = request.param
     executable = getexecutable(name)