From 66d4591e0385322fd899fba5bae0dc3dd4569e2e Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Fri, 20 Dec 2019 15:43:49 +0100
Subject: [PATCH] Remove hacks for ripgrep issue (closes #47)
---
bob/devtools/bootstrap.py | 26 --------------------------
bob/devtools/scripts/build.py | 5 -----
2 files changed, 31 deletions(-)
diff --git a/bob/devtools/bootstrap.py b/bob/devtools/bootstrap.py
index f565e26b..f9e44cf8 100644
--- a/bob/devtools/bootstrap.py
+++ b/bob/devtools/bootstrap.py
@@ -48,28 +48,6 @@ import logging
logger = logging.getLogger(__name__)
-def do_hack(project_dir):
- """
- This function is supposed to be for temporary usage.
-
- It implements hacks for the issue:
- https://gitlab.idiap.ch/bob/bob.devtools/merge_requests/112
-
- """
-
- #### HACK to avoid ripgrep ignoring bin/ directories in our checkouts
- import shutil
-
- git_ignore_file = os.path.join(project_dir, ".gitignore")
- if os.path.exists(git_ignore_file):
- logger.warning(
- "Removing .gitignore to avoid issue with ripgrep (see "
- "https://gitlab.idiap.ch/bob/bob.devtools/merge_requests/112)"
- )
- os.unlink(git_ignore_file)
- #### END OF HACK
-
-
def set_environment(name, value, env=os.environ):
"""Function to setup the environment variable and print debug message.
@@ -462,10 +440,6 @@ if __name__ == "__main__":
setup_logger(logger, args.verbose)
- # Run conda-build hacks
- # TODO: Remove this hack as soon as possible
- do_hack(".")
-
condarc = os.path.join(args.conda_root, "condarc")
install_miniconda(args.conda_root, args.name)
diff --git a/bob/devtools/scripts/build.py b/bob/devtools/scripts/build.py
index 5907efdd..e052dcf8 100644
--- a/bob/devtools/scripts/build.py
+++ b/bob/devtools/scripts/build.py
@@ -190,12 +190,7 @@ def build(
group,
)
- #### HACK to avoid ripgrep ignoring bin/ directories in our checkouts
- # TODO: Remove this hack as soon as possible
- from bob.devtools.bootstrap import do_hack
-
project_dir = os.path.dirname(recipe_dir[0])
- do_hack(project_dir)
# get potential channel upload and other auxiliary channels
channels = get_channels(
--
GitLab