Skip to content

Commit

Permalink
refactor: settle on --exclude-deps
Browse files Browse the repository at this point in the history
  • Loading branch information
fredrikaverpil committed Mar 16, 2023
1 parent 2b0f978 commit f255378
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions src/creosote/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ def parse_args(args):
)

parser.add_argument(
"--exclude-packages",
dest="exclude_packages",
"--exclude-deps",
dest="exclude_deps",
metavar="PACKAGE",
nargs="*",
default=[],
Expand Down Expand Up @@ -125,7 +125,7 @@ def main(args_=None):
deps_reader = parsers.DependencyReader(
deps_file=args.deps_file,
sections=args.sections,
exclude_packages=args.exclude_packages,
exclude_deps=args.exclude_deps,
)
dependency_names = deps_reader.read()

Expand All @@ -147,7 +147,7 @@ def main(args_=None):

unused_packages = sorted(
deps_resolver.get_unused_package_names()
+ excluded_packages_not_installed(args.exclude_packages, args.venv)
+ excluded_packages_not_installed(args.exclude_deps, args.venv)
)
formatters.print_results(unused_packages=unused_packages, format_=args.format)
return 1 if unused_packages else 0 # exit code
Expand Down
6 changes: 3 additions & 3 deletions src/creosote/parsers.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,21 @@ def __init__(
self,
deps_file: str,
sections: List[str],
exclude_packages: List[str],
exclude_deps: List[str],
) -> None:
always_excluded_packages = ["python"] # occurs in Poetry setup

self.deps_file = deps_file
self.sections = sections
self.exclude_packages = exclude_packages + always_excluded_packages
self.exclude_deps = exclude_deps + always_excluded_packages

def read(self) -> List[str]:
if not pathlib.Path(self.deps_file).exists():
raise Exception(f"File {self.deps_file} does not exist")

dependency_names = []
always_excluded_packages = ["python"] # occurs in Poetry setup
packages_to_exclude = always_excluded_packages + self.exclude_packages
packages_to_exclude = always_excluded_packages + self.exclude_deps

if self.deps_file.endswith(".toml"): # pyproject.toml expected
for dependency_name in self.load_pyproject(self.deps_file, self.sections):
Expand Down

0 comments on commit f255378

Please sign in to comment.