Skip to content

Commit

Permalink
fix: clean up repo + linting
Browse files Browse the repository at this point in the history
  • Loading branch information
MatteoVoges committed Jul 31, 2023
1 parent 506cfc5 commit 392e83c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 12 deletions.
7 changes: 0 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,3 @@ local_serve_documentation:
mkdocs_gh_deploy: # to run locally assuming git ssh access
docker build -f Dockerfile.docs --no-cache -t kapitan-docs .
docker run --rm -it -v $(PWD):/src -v ~/.ssh:/root/.ssh -w /src kapitan-docs gh-deploy -f ./mkdocs.yml

pull_oc:
rm -rf omegaconf
git clone --branch 1080-add-list-deep-merging https://github.com/nexenio/omegaconf.git oc
pip install -r oc/requirements/dev.txt -e oc/
mv oc/omegaconf .
rm -rf oc
2 changes: 1 addition & 1 deletion kapitan/omegaconf_inv.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def inventory_omegaconf(
# split file extension and check if yml/yaml
target_name, ext = os.path.splitext(target_name)
if ext not in (".yml", ".yaml"):
logger.warning(f"{target_name}: targets have to be .yml or .yaml files.")
logger.debug(f"{target_name}: targets have to be .yml or .yaml files.")
# RAISE ERROR
continue

Expand Down
8 changes: 4 additions & 4 deletions kapitan/targets.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,17 +143,17 @@ def compile_targets(
continue

deps_to_fetch = []

# get value of "force_fetch" property
for dep_entry in dependencies:
if dep_entry.get("force_fetch", False):
deps_to_fetch.append(dep_entry)
deps_to_fetch.append(dep_entry)

# fetch dependencies with force_fetch set to true
target_obj["dependencies"] = deps_to_fetch

# fetch the specified dependencies with force-fetch
fetch_objs = [t for t in target_objs if t.get("dependencies")]
fetch_objs = [t for t in target_objs if t.get("dependencies")]
if fetch_objs:
fetch_dependencies(output_path, target_objs, dep_cache_dir, True, pool)

Expand Down

0 comments on commit 392e83c

Please sign in to comment.