fix typing

src/mxdev/including.py

@@ -11,7 +11,7 @@
 
 def resolve_dependencies(
     file_or_url: typing.Union[str, pathlib.Path],
-    tmpdir: tempfile.TemporaryDirectory,
+    tmpdir: str,
     http_parent=None,
 ) -> list[pathlib.Path]:
     """Resolve dependencies of a file or url
@@ -25,10 +25,10 @@ def resolve_dependencies(
     if isinstance(file_or_url, str):
         if http_parent:
             file_or_url = parse.urljoin(http_parent, file_or_url)
-        parsed = parse.urlparse(file_or_url)
+        parsed = parse.urlparse(str(file_or_url))
         if parsed.scheme:
-            with request.urlopen(file_or_url) as fio:
-                tf = tempfile.NamedTemporaryFile(suffix=".ini", dir=tmpdir)
+            with request.urlopen(str(file_or_url)) as fio:
+                tf = tempfile.NamedTemporaryFile(suffix=".ini", dir=str(tmpdir))
                 tf.write(fio.read())
                 tf.flush()
                 file = pathlib.Path(tf.name)

src/mxdev/tests/conftest.py

@@ -13,9 +13,6 @@ def tempdir(tmp_path):
         os.chdir(cwd)
 
 
-import httpretty
-
-
 @pytest.fixture
 def src(tempdir):
     base = tempdir / "src"

src/mxdev/tests/test_common.py

@@ -1,6 +1,5 @@
 from .. import vcs
 from ..vcs import common
-from unittest import mock
 
 import logging
 import os
@@ -28,16 +27,16 @@ def test_BaseWorkingCopy():
         common.BaseWorkingCopy(source={})
 
     class TestWorkingCopy(common.BaseWorkingCopy):
-        def checkout(self, **kwargs) -> typing.Union[str, None]:
+        def checkout(self, **kwargs) -> typing.Union[str, None]:  # type: ignore
             ...
 
-        def status(self, **kwargs) -> typing.Union[typing.Tuple[str, str], str]:
+        def status(self, **kwargs) -> typing.Union[typing.Tuple[str, str], str]:  # type: ignore
             ...
 
-        def matches(self) -> bool:
+        def matches(self) -> bool:  # type: ignore
             ...
 
-        def update(self, **kwargs) -> typing.Union[str, None]:
+        def update(self, **kwargs) -> typing.Union[str, None]:  # type: ignore
             ...
 
     bwc = TestWorkingCopy(source=dict(url="https://tld.com/repo.git"))
@@ -163,10 +162,10 @@ def checkout(self, **kwargs) -> typing.Union[str, None]:
         def status(self, **kwargs) -> typing.Union[typing.Tuple[str, str], str]:
             return self.package_status
 
-        def matches(self) -> bool:
+        def matches(self) -> bool:  # type: ignore
             ...
 
-        def update(self, **kwargs) -> typing.Union[str, None]:
+        def update(self, **kwargs) -> typing.Union[str, None]:  # type: ignore
             ...
 
     class WCT(dict):

src/mxdev/tests/utils.py

@@ -4,6 +4,7 @@
 from typing import Any
 from typing import Dict
 from typing import Iterable
+from typing import Union
 
 import os
 import sys
@@ -120,7 +121,7 @@ def __call__(self, line):
 class Process:
     """Process related functions using the tee module."""
 
-    def __init__(self, quiet: bool = False, env=None, cwd: str = None):
+    def __init__(self, quiet: bool = False, env=None, cwd: Union[str, None] = None):
         self.quiet = quiet
         self.env = env
         self.cwd = cwd
@@ -171,7 +172,7 @@ def add_submodule(self, submodule: "GitRepo", submodule_name: str):
         self(f"git add {submodule_name}")
         self(f"git commit -m 'Add submodule {submodule_name}'")
 
-    def add_branch(self, bname: str, msg: str = None):
+    def add_branch(self, bname: str, msg: Union[str, None] = None):
         self(f"git checkout -b {bname}")
 
 

src/mxdev/vcs/common.py

@@ -21,7 +21,7 @@ def print_stderr(s: str):
 
 # taken from
 # http://stackoverflow.com/questions/377017/test-if-executable-exists-in-python
-def which(name_root: str, default: str = None) -> str:
+def which(name_root: str, default: typing.Union[str, None] = None) -> str:
     if platform.system() == "Windows":
         # http://www.voidspace.org.uk/python/articles/command_line.shtml#pathext
         pathext = os.environ["PATHEXT"]