Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
bob
bob.devtools
Commits
ebea84e5
Commit
ebea84e5
authored
Nov 14, 2019
by
André Anjos
💬
Browse files
[conda] Completely remove "license_file" entry on conda recipes
parent
250aad52
Pipeline
#35343
passed with stage
in 4 minutes and 8 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
bob/devtools/bootstrap.py
View file @
ebea84e5
...
...
@@ -52,8 +52,8 @@ def do_hack(project_dir):
"""
This function is supposed to be for temporary usage.
It implements hacks for the issue
s: https://gitlab.idiap.ch/bob/bob.devtools/merge_requests/112
and
https://git
hub.com/conda/conda-build/issues/3767)
It implements hacks for the issue
:
https://git
lab.idiap.ch/bob/bob.devtools/merge_requests/112
"""
...
...
@@ -69,25 +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
candidates
=
[
"LICENSE"
,
"LICENSE.AGPL"
,
"COPYING"
]
for
k
in
candidates
:
license_file
=
os
.
path
.
join
(
project_dir
,
k
)
if
not
os
.
path
.
exists
(
license_file
):
continue
recipe_dir
=
os
.
path
.
join
(
project_dir
,
"conda"
)
if
os
.
path
.
exists
(
recipe_dir
):
logger
.
warning
(
"Copying %s file to conda-recipe dir to avoid issue "
"with conda-build "
"(see: https://github.com/conda/conda-build/issues/3767)"
,
k
,
)
shutil
.
copy
(
license_file
,
recipe_dir
)
#### END OF HACK
def
set_environment
(
name
,
value
,
env
=
os
.
environ
):
"""Function to setup the environment variable and print debug message.
...
...
bob/devtools/templates/conda/meta.yaml
View file @
ebea84e5
...
...
@@ -56,4 +56,3 @@ 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 %)
conda/meta.yaml
View file @
ebea84e5
...
...
@@ -112,4 +112,3 @@ about:
license
:
BSD 3-Clause
summary
:
Tools for development and CI integration of Bob packages
license_family
:
BSD
license_file
:
LICENSE
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment