From 2746ac3033ce9138920f5436f69a99c1ad79d833 Mon Sep 17 00:00:00 2001 From: Enis Afgan Date: Thu, 7 Nov 2024 13:56:37 -0500 Subject: [PATCH] Fix fix-no-deps and fix_lockfile for int revisions --- Makefile | 6 +++++- scripts/fix_lockfile.py | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6a2fc08f..b60e4506 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,10 @@ lint: ## Lint all yaml files find ./$(TOOLSET) -name '*.yml' ! -path .//.schema.yml | grep '^\./[^/]*/' | xargs -n 1 -P 8 python scripts/fix_lockfile.py find ./$(TOOLSET) -name '*.yml' ! -path .//.schema.yml | grep '^\./[^/]*/' | xargs -n 1 -P 8 -I{} pykwalify -d '{}' -s .schema.yml +lint-no-deps: + find ./$(TOOLSET) -name '*.yml' ! -path .//.schema.yml | grep '^\./[^/]*/' | xargs -n 1 -P 8 python scripts/fix_lockfile.py --no-install-repository-dependencies --no-install-resolver-dependencies + find ./$(TOOLSET) -name '*.yml' ! -path .//.schema.yml | grep '^\./[^/]*/' | xargs -n 1 -P 8 -I{} pykwalify -d '{}' -s .schema.yml + fix: ## Fix all lockfiles and add any missing revisions @# Generates the lockfile or updates it if it is missing tools find ./$(TOOLSET) -name '*.yml' ! -path .//.schema.yml | grep '^\./[^/]*/' | xargs -n 1 -P 8 python scripts/fix_lockfile.py @@ -16,7 +20,7 @@ fix: ## Fix all lockfiles and add any missing revisions find ./$(TOOLSET) -name '*.yml' ! -path .//.schema.yml | grep '^\./[^/]*/' | xargs -n 1 -P 8 python scripts/update_tool.py --without fix-no-deps: - find ./$(TOOLSET) -name '*.yml'! -path .//.schema.yml | grep '^\./[^/]*/' | xargs -n 1 -P 8 python scripts/fix_lockfile.py --no-install-repository-dependencies --no-install-resolver-dependencies + find ./$(TOOLSET) -name '*.yml' ! -path .//.schema.yml | grep '^\./[^/]*/' | xargs -n 1 -P 8 python scripts/fix_lockfile.py --no-install-repository-dependencies --no-install-resolver-dependencies find ./$(TOOLSET) -name '*.yml' ! -path .//.schema.yml | grep '^\./[^/]*/' | xargs -n 1 -P 8 python scripts/update_tool.py --without #install: diff --git a/scripts/fix_lockfile.py b/scripts/fix_lockfile.py index 63051567..4799778a 100644 --- a/scripts/fix_lockfile.py +++ b/scripts/fix_lockfile.py @@ -55,7 +55,7 @@ def update_file(fn, install_repository_dependencies, install_resolver_dependenci new_tool = { 'name': tool['name'], 'owner': tool['owner'], - 'revisions': sorted(list(set(revisions))), # Cast to list for yaml serialization + 'revisions': sorted(list(set(map(str, revisions)))), # Cast to list for yaml serialization } if 'tool_shed_url' in tool: