Skip to content
Snippets Groups Projects
Commit 250aad52 authored by André Anjos's avatar André Anjos :speech_balloon:
Browse files

[bootstrap] black-ify; short warning messages

parent f8eb6017
No related branches found
No related tags found
1 merge request!127Reset license file location and remove hack (closes #44)
Pipeline #35338 passed
...@@ -62,27 +62,29 @@ def do_hack(project_dir): ...@@ -62,27 +62,29 @@ def do_hack(project_dir):
git_ignore_file = os.path.join(project_dir, ".gitignore") git_ignore_file = os.path.join(project_dir, ".gitignore")
if os.path.exists(git_ignore_file): if os.path.exists(git_ignore_file):
logger.warning('Removing ".gitignore" to overcome issues with ripgrep')
logger.warning( logger.warning(
"See https://gitlab.idiap.ch/bob/bob.devtools/merge_requests/112" "Removing .gitignore to avoid issue with ripgrep (see "
"https://gitlab.idiap.ch/bob/bob.devtools/merge_requests/112)"
) )
os.unlink(git_ignore_file) os.unlink(git_ignore_file)
#### END OF HACK #### END OF HACK
#### HACK that avoids this issue: #### HACK that avoids this issue:
#### https://github.com/conda/conda-build/issues/3767 #### https://github.com/conda/conda-build/issues/3767
candidates = ['LICENSE', 'LICENSE.AGPL', 'COPYING'] candidates = ["LICENSE", "LICENSE.AGPL", "COPYING"]
for k in candidates: for k in candidates:
license_file = os.path.join(project_dir, k) license_file = os.path.join(project_dir, k)
if not os.path.exists(license_file): continue if not os.path.exists(license_file):
continue
recipe_dir = os.path.join(project_dir, "conda") recipe_dir = os.path.join(project_dir, "conda")
if os.path.exists(recipe_dir): if os.path.exists(recipe_dir):
logger.warning( logger.warning(
"Copying %s file to conda-recipe dir to avoid issue " "Copying %s file to conda-recipe dir to avoid issue "
"with conda build " "with conda-build "
"(https://github.com/conda/conda-build/issues/3767)", k "(see: https://github.com/conda/conda-build/issues/3767)",
) k,
)
shutil.copy(license_file, recipe_dir) shutil.copy(license_file, recipe_dir)
#### END OF HACK #### END OF HACK
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment