Merge pull request #353 from legendu-net/dev

Merge dev into main

Author: dclong

aiutil/__init__.py

@@ -3,4 +3,4 @@
 from . import git
 from . import poetry
 
-__version__ = "0.75.0"
+__version__ = "0.76.0"

aiutil/dockerhub.py

@@ -21,7 +21,7 @@ def tags(self, image: str) -> list[str]:
         if "/" in image:
             user, image = image.split("/")
         url = f"https://hub.docker.com/v2/repositories/{user}/{image}/tags/"
-        res = requests.get(url)
+        res = requests.get(url, timeout=10)
         return res.json()["results"]
 
     def token(self, password: str) -> None:
@@ -35,6 +35,7 @@ def token(self, password: str) -> None:
                 "username": self.user,
                 "password": password
             },
+            timeout=10,
         )
         self._token = res.json()["token"]
 
@@ -59,6 +60,7 @@ def delete_tag(self, image: str, tag: str = "") -> str:
             headers={
                 "Content-Type": "application/json",
                 "Authorization": f"JWT {self._token}"
-            }
+            },
+            timeout=10,
         )
         return tag if res else ""

aiutil/filesystem.py

@@ -392,32 +392,32 @@ def append_lines(
 
 def replace_patterns(
     path: Path,
-    patterns: Union[str, Iterable[str]],
-    repls: Union[str, Iterable[str]],
+    pattern: Union[str, Iterable[str]],
+    repl: Union[str, Iterable[str]],
     regex: bool = True,
 ) -> None:
     """Update a text file using regular expression substitution.
 
     :param path: A Path object to the file to be updated.
-    :param patterns: A (list of) patterns to replace.
-    :param repls: A list of replacements.
+    :param pattern: A (list of) patterns to replace.
+    :param repl: A (list of) replacements.
         or a function to map patterns to replacements.
     :param regex: If true, treat patterns as regular expression pattern;
         otherwise, perform exact matches.
     """
     if isinstance(path, str):
         path = Path(path)
     text = path.read_text(encoding="utf-8")
-    if isinstance(patterns, str):
-        patterns = [patterns]
-    if isinstance(repls, str):
-        repls = [repls]
+    if isinstance(pattern, str):
+        pattern = [pattern]
+    if isinstance(repl, str):
+        repl = [repl]
     if regex:
-        for pattern, repl in zip(patterns, repls):
-            text = re.sub(pattern, repl, text)
+        for p, r in zip(pattern, repl):
+            text = re.sub(p, r, text)
     else:
-        for pattern, repl in zip(patterns, repls):
-            text = text.replace(pattern, repl)
+        for p, r in zip(pattern, repl):
+            text = text.replace(p, r)
     path.write_text(text, encoding="utf-8")
 
 

aiutil/poetry.py

@@ -58,7 +58,7 @@ def _update_version_readme(ver: str, proj_dir: Path) -> None:
     :param ver: The new version.
     :param proj_dir: The root directory of the Poetry project.
     """
-    replace_patterns(proj_dir / README, patterns=r"\d+\.\d+\.\d+", repls=f"{ver}")
+    replace_patterns(proj_dir / README, pattern=r"\d+\.\d+\.\d+", repl=f"{ver}")
 
 
 def _update_version_toml(ver: str, proj_dir: Path) -> None:
@@ -69,8 +69,8 @@ def _update_version_toml(ver: str, proj_dir: Path) -> None:
     """
     replace_patterns(
         proj_dir / TOML,
-        patterns=r"version = .\d+\.\d+\.\d+.",
-        repls=f'version = "{ver}"'
+        pattern=r"version = .\d+\.\d+\.\d+.",
+        repl=f'version = "{ver}"'
     )
 
 
@@ -84,8 +84,8 @@ def _update_version_init(ver: str, proj_dir: Path) -> None:
     for path in (proj_dir / pkg).glob("**/*.py"):
         replace_patterns(
             path,
-            patterns=r"__version__ = .\d+\.\d+\.\d+.",
-            repls=f'__version__ = "{ver}"'
+            pattern=r"__version__ = .\d+\.\d+\.\d+.",
+            repl=f'__version__ = "{ver}"'
         )
 
 

aiutil/pypi.py

@@ -21,7 +21,7 @@ def dep(pkg: str, recursive: bool = False) -> set[str]:
 
 def _dep(pkg):
     url = f"https://pypi.org/pypi/{pkg}/json"
-    deps = requests.get(url).json()["info"]["requires_dist"]
+    deps = requests.get(url, timeout=10).json()["info"]["requires_dist"]
     if deps is None:
         return set()
     return set(dep for dep in deps if "extra ==" not in dep)

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aiutil"
-version = "0.75.0"
+version = "0.76.0"
 description = "A utils Python package for data scientists."
 authors = ["Benjamin Du <[email protected]>"]
 license = "MIT"
@@ -88,7 +88,7 @@ ignored-modules = "pyspark.sql.functions"
 ignored-classes = "Namespace"
 
 [tool.pylint.messages_control]
-disable = "C0103,C0200,C0301,C0303,C0330,R0902,R0903,R0911,R0912,R0913,W0621,W0622,W0702,W0703,W1116"
+disable = "C0103,C0200,C0301,C0303,R0902,R0903,R0911,R0912,R0913,W0621,W0622,W0702,W0703,W1116"
 
 [build-system]
 requires = ["poetry>=1.0.0"]