diff --git a/bob/devtools/bootstrap.py b/bob/devtools/bootstrap.py index ac58248e86eeeb5c7d5edff9d306fea0cf8e0250..bba784737e64aa4e3152cc88abafb07bf0e1f2da 100644 --- a/bob/devtools/bootstrap.py +++ b/bob/devtools/bootstrap.py @@ -69,40 +69,6 @@ def do_hack(project_dir): os.unlink(git_ignore_file) #### END OF HACK - #### HACK that avoids this issue: https://github.com/conda/conda-build/issues/3767 - license_file = os.path.join(project_dir, "LICENSE") - if not os.path.exists(license_file): - license_file = os.path.join(project_dir, "LICENSE.AGPL") - - recipe_dir = os.path.join(project_dir, "conda") - if os.path.exists(license_file) and os.path.exists(recipe_dir): - logger.warning( - "Copying LICENSE file to `./conda` dir to avoid issue with conda build (https://github.com/conda/conda-build/issues/3767)" - ) - logger.warning( - "Replacing ../LICENSE to LICENSE (https://github.com/conda/conda-build/issues/3767)" - ) - shutil.copyfile( - license_file, - os.path.join(recipe_dir, os.path.basename(license_file)), - ) - - # Checking COPYING file just in case - copying_file = os.path.join(project_dir, "COPYING") - if os.path.exists(copying_file): - shutil.copyfile(copying_file, os.path.join(recipe_dir, "COPYING")) - - meta_file = os.path.join(recipe_dir, "meta.yaml") - recipe = open(meta_file).readlines() - recipe = [ - l.replace("../COPYING", "COPYING") - .replace("../LICENSE", "LICENSE") - .replace("../LICENSE.AGPL", "LICENSE.AGPL") - for l in recipe - ] - open(meta_file, "wt").write("".join(recipe)) - #### END OF HACK - def set_environment(name, value, env=os.environ): """Function to setup the environment variable and print debug message. diff --git a/bob/devtools/templates/conda/meta.yaml b/bob/devtools/templates/conda/meta.yaml index 3a8517fdf42ea69bfd0c2b476a7d34b62014ed37..d9b002cac34ae7f1fe4f1cb57a0c0503da60fa64 100644 --- a/bob/devtools/templates/conda/meta.yaml +++ b/bob/devtools/templates/conda/meta.yaml @@ -56,4 +56,4 @@ about: home: https://www.idiap.ch/software/(( group ))/ license: (% if license == 'gplv3' %)GNU General Public License v3 (GPLv3)(% else %)BSD 3-Clause(% endif %) license_family: (% if license == 'gplv3' %)GPL(% else %)BSD(% endif %) - license_file: (% if license == 'gplv3' %)../COPYING(% else %)../LICENSE(% endif %) + license_file: (% if license == 'gplv3' %)COPYING(% else %)LICENSE(% endif %) diff --git a/conda/meta.yaml b/conda/meta.yaml index df6141cd536413625bc1e6434408f5e7af3c74ba..d9da932f181c2d05fbdbb9de6f994767adf6ecaf 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -103,7 +103,7 @@ test: - bdt dav clean-betas --help - bdt dav upload --help - bdt gitlab process-pipelines --help - - bdt gitlab get-pipelines --help + - bdt gitlab get-pipelines --help - sphinx-build -aEW ${PREFIX}/share/doc/{{ name }}/doc sphinx - if [ -n "${CI_PROJECT_DIR}" ]; then mv sphinx "${CI_PROJECT_DIR}/"; fi @@ -112,4 +112,4 @@ about: license: BSD 3-Clause summary: Tools for development and CI integration of Bob packages license_family: BSD - license_file: ../LICENSE + license_file: LICENSE