Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
bob.devtools
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
bob
bob.devtools
Commits
650a047b
Commit
650a047b
authored
5 years ago
by
André Anjos
Browse files
Options
Downloads
Patches
Plain Diff
[conda] Reset license file location and remove hack (closes
#44
)
parent
862fc0f9
No related branches found
No related tags found
1 merge request
!127
Reset license file location and remove hack (closes #44)
Pipeline
#35333
failed
5 years ago
Stage: build
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
bob/devtools/bootstrap.py
+0
-34
0 additions, 34 deletions
bob/devtools/bootstrap.py
bob/devtools/templates/conda/meta.yaml
+1
-1
1 addition, 1 deletion
bob/devtools/templates/conda/meta.yaml
conda/meta.yaml
+2
-2
2 additions, 2 deletions
conda/meta.yaml
with
3 additions
and
37 deletions
bob/devtools/bootstrap.py
+
0
−
34
View file @
650a047b
...
@@ -69,40 +69,6 @@ def do_hack(project_dir):
...
@@ -69,40 +69,6 @@ def do_hack(project_dir):
os
.
unlink
(
git_ignore_file
)
os
.
unlink
(
git_ignore_file
)
#### END OF HACK
#### 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
):
def
set_environment
(
name
,
value
,
env
=
os
.
environ
):
"""
Function to setup the environment variable and print debug message.
"""
Function to setup the environment variable and print debug message.
...
...
This diff is collapsed.
Click to expand it.
bob/devtools/templates/conda/meta.yaml
+
1
−
1
View file @
650a047b
...
@@ -56,4 +56,4 @@ about:
...
@@ -56,4 +56,4 @@ about:
home
:
https://www.idiap.ch/software/(( group ))/
home
:
https://www.idiap.ch/software/(( group ))/
license
:
(% if license == 'gplv3' %)GNU General Public License v3 (GPLv3)(% else %)BSD 3-Clause(% endif %)
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_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 %)
This diff is collapsed.
Click to expand it.
conda/meta.yaml
+
2
−
2
View file @
650a047b
...
@@ -103,7 +103,7 @@ test:
...
@@ -103,7 +103,7 @@ test:
-
bdt dav clean-betas --help
-
bdt dav clean-betas --help
-
bdt dav upload --help
-
bdt dav upload --help
-
bdt gitlab process-pipelines --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
-
sphinx-build -aEW ${PREFIX}/share/doc/{{ name }}/doc sphinx
-
if [ -n "${CI_PROJECT_DIR}" ]; then mv sphinx "${CI_PROJECT_DIR}/"; fi
-
if [ -n "${CI_PROJECT_DIR}" ]; then mv sphinx "${CI_PROJECT_DIR}/"; fi
...
@@ -112,4 +112,4 @@ about:
...
@@ -112,4 +112,4 @@ about:
license
:
BSD 3-Clause
license
:
BSD 3-Clause
summary
:
Tools for development and CI integration of Bob packages
summary
:
Tools for development and CI integration of Bob packages
license_family
:
BSD
license_family
:
BSD
license_file
:
../
LICENSE
license_file
:
LICENSE
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment