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
23eb0125
Commit
23eb0125
authored
5 years ago
by
André Anjos
Browse files
Options
Downloads
Patches
Plain Diff
[build] Fix detection of .conda packages on channel
parent
60c41b47
No related branches found
No related tags found
No related merge requests found
Pipeline
#35371
passed
5 years ago
Stage: build
Stage: deploy
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
bob/devtools/build.py
+10
-7
10 additions, 7 deletions
bob/devtools/build.py
with
10 additions
and
7 deletions
bob/devtools/build.py
+
10
−
7
View file @
23eb0125
...
...
@@ -244,19 +244,22 @@ def exists_on_channel(channel_url, basename):
# vlfeat-0.9.20-0 -> '0'
# vlfeat-0.9.21-h18fa195_0 -> 'h18fa195_0'
# tqdm-4.11.1-py36_0 -> 'py36_0'
# untokenize-0.1.1-py_0.conda -> 'py_0'
# websocket-client-0.47.0-py27haf68d3b_0 -> 'py27haf68d3b_0'
# websocket-client-0.47.0-py36haf68d3b_0 -> 'py36haf68d3b_0'
s
=
build
.
rsplit
(
"
_
"
,
1
)
return
s
[
1
]
if
len
(
s
)
==
2
else
s
[
0
]
self_build_number
=
_get_build_number
(
basename
)
other_build_numbers
=
[
_get_build_number
(
os
.
path
.
basename
(
k
))
for
k
in
urls
]
other_build_numbers
=
dict
(
[(
k
,
_get_build_number
(
os
.
path
.
basename
(
k
)))
for
k
in
urls
]
)
if
self_build_number
in
other_build_numbers
:
candidate
=
urls
[
other_build_numbers
.
index
(
self_build_number
)]
if
self_build_number
in
other_build_numbers
.
values
():
pkg_type
=
'
.conda
'
if
basename
.
endswith
(
'
.conda
'
)
else
'
.tar.bz2
'
if
candidate
.
endswith
(
pkg_type
):
#match
return
""
.
join
((
channel_url
,
candidate
))
for
k
,
v
in
other_build_numbers
.
items
():
if
k
.
endswith
(
pkg_type
):
#match
return
""
.
join
((
channel_url
,
k
))
def
remove_pins
(
deps
):
...
...
@@ -759,8 +762,8 @@ if __name__ == "__main__":
condarc_options
[
"
croot
"
]
=
os
.
path
.
join
(
prefix
,
"
conda-bld
"
)
# builds all dependencies in the 'deps' subdirectory - or at least checks
# these dependencies are already available; these dependencies go directly
to
# the public channel once built
# these dependencies are already available; these dependencies go directly
#
to
the public channel once built
recipes
=
load_order_file
(
os
.
path
.
join
(
"
deps
"
,
"
order.txt
"
))
for
k
,
recipe
in
enumerate
([
os
.
path
.
join
(
"
deps
"
,
k
)
for
k
in
recipes
]):
...
...
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