diff --git a/komodo/build.py b/komodo/build.py index 7e234482..b1bad21a 100644 --- a/komodo/build.py +++ b/komodo/build.py @@ -136,7 +136,7 @@ def download(package_name, ver, prefix, url, hash_str, fakeroot, destination): session.mount("https://", requests.adapters.HTTPAdapter(max_retries=20)) response = session.get(url, stream=True) - if response.status_code != 200: + if response.status_code != requests.codes.ok: msg = f"GET request to {url} returned status code {response.status_code}" raise RuntimeError( msg, diff --git a/komodo/check_unused_package.py b/komodo/check_unused_package.py index 335c87d0..9a6937eb 100644 --- a/komodo/check_unused_package.py +++ b/komodo/check_unused_package.py @@ -8,6 +8,7 @@ import argparse import os +import sys from dataclasses import dataclass from typing import Any @@ -146,7 +147,7 @@ def main(): args.release_file, package_status, args.repo, builtin_python_versions ) print(result.message) - exit(result.exitcode) + sys.exit(result.exitcode) if __name__ == "__main__": diff --git a/komodo/cleanup.py b/komodo/cleanup.py index 8839cf19..60aece8b 100755 --- a/komodo/cleanup.py +++ b/komodo/cleanup.py @@ -5,6 +5,8 @@ from komodo.yaml_file_types import ReleaseFile, RepositoryFile +REQUIRED_CLI_ARGS = 2 + def cleanup(repository_file_path: str, release_files_path: List[str]): repository_file = RepositoryFile()(repository_file_path) @@ -36,7 +38,7 @@ def cleanup(repository_file_path: str, release_files_path: List[str]): def main(): - if len(sys.argv) < 3: + if len(sys.argv) < 1 + REQUIRED_CLI_ARGS: sys.exit("usage: komodo.cleanup repository.yml rel1.yml rel2.yml ... reln.yml") repository = sys.argv[1] diff --git a/komodo/cli.py b/komodo/cli.py index f47f249b..0eaae626 100755 --- a/komodo/cli.py +++ b/komodo/cli.py @@ -218,12 +218,11 @@ def generate_release_manifest( for package, version in release_file_content.items(): entry: Dict[str, str] = repository_file_content[package][version] maintainer = repository_file_content[package][version]["maintainer"] + release[package] = {"maintainer": maintainer} if entry.get("fetch") == "git": - version = git_hashes[package] - release[package] = { - "version": version, - "maintainer": maintainer, - } + release[package] = {"version": git_hashes[package]} + else: + release[package] = {"version": version} yaml = YAML() yaml.dump(release, filehandle) diff --git a/komodo/pypi_dependencies.py b/komodo/pypi_dependencies.py index 8afa9c63..b7bfa540 100644 --- a/komodo/pypi_dependencies.py +++ b/komodo/pypi_dependencies.py @@ -319,11 +319,10 @@ def satisfied( satisfied, transient_requirements = self._satisfied([requirement]) if satisfied: self._satisfied_requirements.add(requirement) + elif requirement in self._failed_requirements: + self._failed_requirements[requirement] += f", {package_name}" else: - if requirement in self._failed_requirements: - self._failed_requirements[requirement] += f", {package_name}" - else: - self._failed_requirements[requirement] = package_name + self._failed_requirements[requirement] = package_name return satisfied and all( self.satisfied(transient, package_name, extra) for (transients, extra) in transient_requirements diff --git a/komodo/symlink/suggester/cli.py b/komodo/symlink/suggester/cli.py index 698c18e5..614012dc 100755 --- a/komodo/symlink/suggester/cli.py +++ b/komodo/symlink/suggester/cli.py @@ -92,8 +92,8 @@ def suggest_symlink_configuration( if not dry_run: repo.create_git_ref(ref=f"refs/heads/{target_branch}", sha=from_sha) - for symlink_config_file in config_files: - symlink_config_file = symlink_config_file.strip() + for _symlink_config_file in config_files: + symlink_config_file = _symlink_config_file.strip() try: sym_conf_content = repo.get_contents(symlink_config_file, ref=args.git_ref) except UnknownObjectException: diff --git a/komodo/symlink/suggester/configuration.py b/komodo/symlink/suggester/configuration.py index 153256e8..e8b31dc9 100644 --- a/komodo/symlink/suggester/configuration.py +++ b/komodo/symlink/suggester/configuration.py @@ -21,8 +21,8 @@ def _get_concrete_release(self, link): return release def update(self, release, mode, python_versions: List[str]): - for python_version in python_versions: - python_version = python_version.strip() + for _python_version in python_versions: + python_version = _python_version.strip() release.set_python_version(python_version) link = f"{mode}-{python_version}" diff --git a/komodo/symlink/suggester/release.py b/komodo/symlink/suggester/release.py index 23a0b142..ca7ffee3 100644 --- a/komodo/symlink/suggester/release.py +++ b/komodo/symlink/suggester/release.py @@ -43,7 +43,7 @@ def py_ver(self) -> str: raise ValueError(msg) from exc except AttributeError: # In the case that this is a monthly alias without postfix, assume 3.8 - if len(repr(self)) == 7: + if len(repr(self)) == len("2022.01"): return "py38" raise diff --git a/pyproject.toml b/pyproject.toml index 598fde6c..1cbd0ef9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -93,10 +93,6 @@ ignore = [ "PLR0912", # Too many branches "PLR0913", # too-many-arguments "PLR0915", # Too many statements - "PLR1722", # use sys.exit - "PLR2004", # Magic value used in comparison - "PLR5501", # use elif instead of else then if - "PLW2901", # for loop variable overwritten ] [tool.ruff.lint.isort] @@ -106,3 +102,6 @@ known-first-party = ["komodo"] "docs/conf.py" = [ "PLR1711", # useless return statement ] +"tests/*.py" = [ + "PLR2004", # magic-value-comparison +]