Skip to content
This repository was archived by the owner on Mar 14, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion komodo/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 2 additions & 1 deletion komodo/check_unused_package.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import argparse
import os
import sys
from dataclasses import dataclass
from typing import Any

Expand Down Expand Up @@ -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__":
Expand Down
4 changes: 3 additions & 1 deletion komodo/cleanup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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]
Expand Down
9 changes: 4 additions & 5 deletions komodo/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
7 changes: 3 additions & 4 deletions komodo/pypi_dependencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions komodo/symlink/suggester/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions komodo/symlink/suggester/configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion komodo/symlink/suggester/release.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -106,3 +102,6 @@ known-first-party = ["komodo"]
"docs/conf.py" = [
"PLR1711", # useless return statement
]
"tests/*.py" = [
"PLR2004", # magic-value-comparison
]