Merge pull request #882 from galaxyproject/agreed-falcon

Fix fix-no-deps and fix_lockfile for int revisions
galaxyproject · Nov 7, 2024 · 314181d · 314181d
2 parents 0a9adc6 + 2746ac3
commit 314181d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -9,14 +9,18 @@ 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
 	@# --without says only add those hashes for those missing hashes (zB new tools)
 	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
@@ -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: