chore(ruff): Run automated fixes (73 fixed)

ruff --show-fixes --fix .

Fixed 73 errors:
- conftest.py:
    1 × UP006 (non-pep585-annotation)
- docs/conf.py:
    1 × I001 (unsorted-imports)
    1 × SIM108 (if-else-block-instead-of-if-exp)
    1 × RUF100 (unused-noqa)
- scripts/generate_gitlab.py:
    1 × I001 (unsorted-imports)
    1 × SIM300 (yoda-conditions)
    1 × UP031 (printf-string-formatting)
    1 × UP032 (f-string)
    1 × UP024 (os-error-alias)
- src/vcspull/__init__.py:
    1 × RUF100 (unused-noqa)
- src/vcspull/_internal/config_reader.py:
    5 × UP006 (non-pep585-annotation)
- src/vcspull/cli/__init__.py:
    3 × UP006 (non-pep585-annotation)
- src/vcspull/cli/sync.py:
    1 × UP006 (non-pep585-annotation)
- src/vcspull/config.py:
    5 × UP006 (non-pep585-annotation)
    5 × B006 (mutable-argument-default)
    4 × RUF013 (implicit-optional)
    1 × I001 (unsorted-imports)
    1 × UP018 (native-literals)
- src/vcspull/log.py:
    1 × SIM210 (if-expr-with-true-false)
- src/vcspull/types.py:
    1 × I001 (unsorted-imports)
    1 × UP006 (non-pep585-annotation)
- src/vcspull/util.py:
    1 × UP006 (non-pep585-annotation)
- src/vcspull/validator.py:
    1 × UP006 (non-pep585-annotation)
    1 × PERF102 (incorrect-dict-iterator)
    1 × SIM102 (collapsible-if)
    1 × B007 (unused-loop-control-variable)
- tests/__init__.py:
    1 × RUF100 (unused-noqa)
- tests/helpers.py:
    2 × UP006 (non-pep585-annotation)
    1 × C408 (unnecessary-collection-call)
- tests/test_cli.py:
    3 × SIM105 (suppressible-exception)
    2 × I001 (unsorted-imports)
    1 × UP006 (non-pep585-annotation)
- tests/test_config.py:
    6 × UP006 (non-pep585-annotation)
- tests/test_config_file.py:
    2 × B007 (unused-loop-control-variable)
    1 × SIM117 (multiple-with-statements)
- tests/test_repo.py:
    2 × SIM300 (yoda-conditions)
    1 × I001 (unsorted-imports)
    1 × PERF102 (incorrect-dict-iterator)
    1 × B007 (unused-loop-control-variable)
- tests/test_sync.py:
    2 × SIM118 (in-dict-keys)
    2 × PERF102 (incorrect-dict-iterator)
    1 × I001 (unsorted-imports)
    1 × UP006 (non-pep585-annotation)

Author: tony

conftest.py

@@ -8,7 +8,7 @@
 @pytest.fixture(autouse=True)
 def add_doctest_fixtures(
     request: pytest.FixtureRequest,
-    doctest_namespace: t.Dict[str, t.Any],
+    doctest_namespace: dict[str, t.Any],
 ) -> None:
     from _pytest.doctest import DoctestItem
 

docs/conf.py

@@ -1,9 +1,9 @@
 # flake8: noqa: E501
 import inspect
+import pathlib
 import sys
 import typing as t
 from os.path import relpath
-import pathlib
 
 import vcspull
 
@@ -180,7 +180,7 @@
 
 def linkcode_resolve(
     domain: str, info: dict[str, str]
-) -> t.Union[None, str]:  # NOQA: C901
+) -> t.Union[None, str]:
     """
     Determine the URL corresponding to Python object
 
@@ -228,10 +228,7 @@ def linkcode_resolve(
     except Exception:
         lineno = None
 
-    if lineno:
-        linespec = "#L%d-L%d" % (lineno, lineno + len(source) - 1)
-    else:
-        linespec = ""
+    linespec = "#L%d-L%d" % (lineno, lineno + len(source) - 1) if lineno else ""
 
     fn = relpath(fn, start=pathlib.Path(vcspull.__file__).parent)
 

scripts/generate_gitlab.py

@@ -6,8 +6,8 @@
 
 import requests
 import yaml
-
 from libvcs.sync.git import GitRemote
+
 from vcspull.cli.sync import guess_vcs
 from vcspull.types import RawConfig
 
@@ -58,17 +58,17 @@
             sys.exit(0)
 
     config_file = open(config_filename, "w")
-except IOError:
+except OSError:
     print("File %s not accesible" % (config_filename))
     sys.exit(1)
 
 response = requests.get(
-    "%s/api/v4/groups/%s/projects" % (gitlab_host, gitlab_namespace),
+    f"{gitlab_host}/api/v4/groups/{gitlab_namespace}/projects",
     params={"include_subgroups": "true", "per_page": "100"},
     headers={"Authorization": "Bearer %s" % (gitlab_token)},
 )
 
-if 200 != response.status_code:
+if response.status_code != 200:
     print("Error: ", response)
     sys.exit(1)
 

src/vcspull/__init__.py

@@ -12,6 +12,6 @@
 import logging
 from logging import NullHandler
 
-from . import cli  # NOQA
+from . import cli
 
 logging.getLogger(__name__).addHandler(NullHandler())

src/vcspull/_internal/config_reader.py

@@ -9,7 +9,7 @@
 
     FormatLiteral = Literal["json", "yaml"]
 
-    RawConfigData: TypeAlias = t.Dict[t.Any, t.Any]
+    RawConfigData: TypeAlias = dict[t.Any, t.Any]
 
 
 class ConfigReader:
@@ -26,7 +26,7 @@ def __init__(self, content: "RawConfigData") -> None:
         self.content = content
 
     @staticmethod
-    def _load(format: "FormatLiteral", content: str) -> t.Dict[str, t.Any]:
+    def _load(format: "FormatLiteral", content: str) -> dict[str, t.Any]:
         """Load raw config data and directly return it.
 
         >>> ConfigReader._load("json", '{ "session_name": "my session" }')
@@ -37,14 +37,14 @@ def _load(format: "FormatLiteral", content: str) -> t.Dict[str, t.Any]:
         """
         if format == "yaml":
             return t.cast(
-                t.Dict[str, t.Any],
+                dict[str, t.Any],
                 yaml.load(
                     content,
                     Loader=yaml.SafeLoader,
                 ),
             )
         elif format == "json":
-            return t.cast(t.Dict[str, t.Any], json.loads(content))
+            return t.cast(dict[str, t.Any], json.loads(content))
         else:
             raise NotImplementedError(f"{format} not supported in configuration")
 
@@ -72,7 +72,7 @@ def load(cls, format: "FormatLiteral", content: str) -> "ConfigReader":
         )
 
     @classmethod
-    def _from_file(cls, path: pathlib.Path) -> t.Dict[str, t.Any]:
+    def _from_file(cls, path: pathlib.Path) -> dict[str, t.Any]:
         r"""Load data from file path directly to dictionary.
 
         **YAML file**

src/vcspull/cli/__init__.py

@@ -35,7 +35,7 @@
 @overload
 def create_parser(
     return_subparsers: t.Literal[True],
-) -> t.Tuple[argparse.ArgumentParser, t.Any]:
+) -> tuple[argparse.ArgumentParser, t.Any]:
     ...
 
 
@@ -46,7 +46,7 @@ def create_parser(return_subparsers: t.Literal[False]) -> argparse.ArgumentParse
 
 def create_parser(
     return_subparsers: bool = False,
-) -> t.Union[argparse.ArgumentParser, t.Tuple[argparse.ArgumentParser, t.Any]]:
+) -> t.Union[argparse.ArgumentParser, tuple[argparse.ArgumentParser, t.Any]]:
     parser = argparse.ArgumentParser(
         prog="vcspull",
         formatter_class=argparse.RawDescriptionHelpFormatter,
@@ -80,7 +80,7 @@ def create_parser(
     return parser
 
 
-def cli(_args: t.Optional[t.List[str]] = None) -> None:
+def cli(_args: t.Optional[list[str]] = None) -> None:
     parser, sync_parser = create_parser(return_subparsers=True)
     args = parser.parse_args(_args)
 

src/vcspull/cli/sync.py

@@ -55,7 +55,7 @@ def create_sync_subparser(parser: argparse.ArgumentParser) -> argparse.ArgumentP
 
 
 def sync(
-    repo_patterns: t.List[str],
+    repo_patterns: list[str],
     config: pathlib.Path,
     exit_on_error: bool,
     parser: t.Optional[

src/vcspull/config.py

@@ -12,6 +12,7 @@
 import typing as t
 
 from libvcs.sync.git import GitRemote
+
 from vcspull.validator import is_valid_config
 
 from . import exc
@@ -73,7 +74,7 @@ def extract_repos(
     for directory, repos in config.items():
         assert isinstance(repos, dict)
         for repo, repo_data in repos.items():
-            conf: t.Dict[str, t.Any] = {}
+            conf: dict[str, t.Any] = {}
 
             """
             repo_name: http://myrepo.com/repo.git
@@ -134,9 +135,11 @@ def is_valid_config_dict(val: t.Any) -> "TypeGuard[ConfigDict]":
 
 
 def find_home_config_files(
-    filetype: list[str] = ["json", "yaml"]
+    filetype: t.Optional[list[str]] = None
 ) -> list[pathlib.Path]:
     """Return configs of ``.vcspull.{yaml,json}`` in user's home directory."""
+    if filetype is None:
+        filetype = ["json", "yaml"]
     configs: list[pathlib.Path] = []
 
     yaml_config = pathlib.Path(os.path.expanduser("~/.vcspull.yaml"))
@@ -151,7 +154,7 @@ def find_home_config_files(
             " quickstart."
         )
     else:
-        if sum(filter(None, [has_json_config, has_yaml_config])) > int(1):
+        if sum(filter(None, [has_json_config, has_yaml_config])) > 1:
             raise exc.MultipleConfigWarning()
         if has_yaml_config:
             configs.append(yaml_config)
@@ -163,12 +166,12 @@ def find_home_config_files(
 
 def find_config_files(
     path: t.Optional[t.Union[list[pathlib.Path], pathlib.Path]] = None,
-    match: t.Union[list[str], str] = ["*"],
+    match: t.Optional[t.Union[list[str], str]] = None,
     filetype: t.Union[
         t.Literal["json", "yaml", "*"], list[t.Literal["json", "yaml", "*"]]
-    ] = ["json", "yaml"],
+    ] = None,
     include_home: bool = False,
-) -> t.List[pathlib.Path]:
+) -> list[pathlib.Path]:
     """Return repos from a directory and match. Not recursive.
 
     Parameters
@@ -192,6 +195,10 @@ def find_config_files(
     list :
         list of absolute paths to config files.
     """
+    if filetype is None:
+        filetype = ["json", "yaml"]
+    if match is None:
+        match = ["*"]
     config_files = []
     if path is None:
         path = get_config_dir()
@@ -221,7 +228,7 @@ def find_config_files(
 
 def load_configs(
     files: list[pathlib.Path], cwd: pathlib.Path = pathlib.Path.cwd()
-) -> t.List["ConfigDict"]:
+) -> list["ConfigDict"]:
     """Return repos from a list of files.
 
     Parameters
@@ -303,8 +310,8 @@ def detect_duplicate_repos(
 
 def in_dir(
     config_dir: t.Optional[pathlib.Path] = None,
-    extensions: list[str] = [".yml", ".yaml", ".json"],
-) -> t.List[str]:
+    extensions: t.Optional[list[str]] = None,
+) -> list[str]:
     """Return a list of configs in ``config_dir``.
 
     Parameters
@@ -318,6 +325,8 @@ def in_dir(
     -------
     list
     """
+    if extensions is None:
+        extensions = [".yml", ".yaml", ".json"]
     if config_dir is not None:
         config_dir = get_config_dir()
     configs = []
@@ -330,7 +339,7 @@ def in_dir(
 
 
 def filter_repos(
-    config: t.List["ConfigDict"],
+    config: list["ConfigDict"],
     dir: t.Union[pathlib.Path, t.Literal["*"], str, None] = None,
     vcs_url: t.Union[str, None] = None,
     name: t.Union[str, None] = None,
@@ -382,7 +391,7 @@ def filter_repos(
 
 
 def is_config_file(
-    filename: str, extensions: t.Union[list[str], str] = [".yml", ".yaml", ".json"]
+    filename: str, extensions: t.Optional[t.Union[list[str], str]] = None
 ) -> bool:
     """Return True if file has a valid config file type.
 
@@ -397,5 +406,7 @@ def is_config_file(
     -------
     bool : True if is a valid config file type
     """
+    if extensions is None:
+        extensions = [".yml", ".yaml", ".json"]
     extensions = [extensions] if isinstance(extensions, str) else extensions
     return any(filename.endswith(e) for e in extensions)

src/vcspull/log.py

@@ -191,4 +191,4 @@ class RepoFilter(logging.Filter):
 
     def filter(self, record: logging.LogRecord) -> bool:
         """Only return a record if a keyword object."""
-        return True if "keyword" in record.__dict__ else False
+        return "keyword" in record.__dict__

src/vcspull/types.py

@@ -1,10 +1,9 @@
 import pathlib
 import typing as t
 
-from typing_extensions import NotRequired, TypedDict
-
 from libvcs._internal.types import StrPath, VCSLiteral
 from libvcs.sync.git import GitSyncRemoteDict
+from typing_extensions import NotRequired, TypedDict
 
 
 class RawConfigDict(t.TypedDict):
@@ -25,7 +24,7 @@ class ConfigDict(TypedDict):
     dir: pathlib.Path
     url: str
     remotes: NotRequired[t.Optional[GitSyncRemoteDict]]
-    shell_command_after: NotRequired[t.Optional[t.List[str]]]
+    shell_command_after: NotRequired[t.Optional[list[str]]]
 
 
 ConfigDir = dict[str, ConfigDict]