Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
conda
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
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
bob
conda
Commits
755f052c
Commit
755f052c
authored
5 years ago
by
Amir MOHAMMADI
Browse files
Options
Downloads
Patches
Plain Diff
[bob-devel] fix conflicts and update versions
parent
6416bfce
Branches
Branches containing commit
No related tags found
1 merge request
!420
Drop free channel when building bob.conda
Pipeline
#32369
failed
5 years ago
Stage: build
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
conda/beat-devel/meta.yaml
+2
-2
2 additions, 2 deletions
conda/beat-devel/meta.yaml
conda/bob-devel/meta.yaml
+12
-12
12 additions, 12 deletions
conda/bob-devel/meta.yaml
conda_build_config.yaml
+1
-1
1 addition, 1 deletion
conda_build_config.yaml
with
15 additions
and
15 deletions
conda/beat-devel/meta.yaml
+
2
−
2
View file @
755f052c
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
{
%
set nopin =
[
'
ca-certificates'
,
'
certifi'
,
'
openssl'
,
'
libstdcxx-ng'
,
'
libgcc-ng'
,
'
libcxx'
,
'
libcxxabi'
]
%
}
{
%
set nopin =
[
'
ca-certificates'
,
'
certifi'
,
'
openssl'
,
'
libstdcxx-ng'
,
'
libgcc-ng'
,
'
libcxx'
,
'
libcxxabi'
]
%
}
package
:
package
:
name
:
beat-devel
name
:
beat-devel
version
:
2019.08.0
7
version
:
2019.08.0
8
build
:
build
:
# the build number must be zero all the time.
# the build number must be zero all the time.
...
@@ -15,7 +15,7 @@ build:
...
@@ -15,7 +15,7 @@ build:
requirements
:
requirements
:
host
:
host
:
-
python {{ python }}
-
python {{ python }}
-
bob-devel 2019.08.0
4
-
bob-devel 2019.08.0
8
-
docker-py 4.0.2
-
docker-py 4.0.2
-
flask 1.0.2
-
flask 1.0.2
-
flask-cors 3.0.7
-
flask-cors 3.0.7
...
...
This diff is collapsed.
Click to expand it.
conda/bob-devel/meta.yaml
+
12
−
12
View file @
755f052c
...
@@ -4,7 +4,7 @@ package:
...
@@ -4,7 +4,7 @@ package:
name
:
bob-devel
name
:
bob-devel
# please update the version of beat-devel and update bob-devel's version there
# please update the version of beat-devel and update bob-devel's version there
# as well in the same merge request.
# as well in the same merge request.
version
:
2019.08.0
6
version
:
2019.08.0
8
build
:
build
:
# the build number must be zero all the time.
# the build number must be zero all the time.
...
@@ -17,11 +17,12 @@ build:
...
@@ -17,11 +17,12 @@ build:
requirements
:
requirements
:
host
:
host
:
-
python {{ python }}
-
python {{ python }}
# IMPORTANT: To update this list, create a conda environment with all the below
# packages without any pinning. Once the environment is resolved, observe those
# versions and put them here.
# Dependency list of bob packages. Everything is pinned to allow for better
# Dependency list of bob packages. Everything is pinned to allow for better
# reproducibility. Please keep this list sorted. It is MANDATORY that you
# reproducibility.
# update all dependencies at once (to their latest version) each time you
# modify the dependencies here. Use ``conda search`` to find the latest
# version of packages.
-
boost 1.67.0
-
boost 1.67.0
-
caffe
1.0
# [linux]
-
caffe
1.0
# [linux]
-
click
7.0
-
click
7.0
...
@@ -45,25 +46,26 @@ requirements:
...
@@ -45,25 +46,26 @@ requirements:
-
libpng 1.6.37
-
libpng 1.6.37
-
libsvm
3.22
-
libsvm
3.22
-
libtiff 4.0.10
-
libtiff 4.0.10
-
madmom 0.16.1
-
matplotlib 3.1.0
-
matplotlib 3.1.0
-
menpo 0.8.1
-
menpofit 0.5.0
-
mkl
2019.4
-
mkl
2019.4
-
mne 0.15.2
-
mne 0.15.2
-
mr.developer
1.38
-
mr.developer
1.38
-
nose 1.3.7
-
nose 1.3.7
-
numpy 1.16.
2
-
numpy 1.16.
4
-
opencv 3.4.2
-
opencv 3.4.2
-
pillow 6.1.0
-
pillow 6.1.0
-
pkg-config 0.29.2
-
pkg-config 0.29.2
-
pyedflib 0.1.11
-
pyedflib 0.1.11
-
cudatoolkit
9.0
# [linux]
-
cudatoolkit
9.0
# [linux]
-
pytorch 1.
0.1
# [linux]
-
pytorch 1.
1.0
# [linux]
-
pyyaml 5.1.1
-
pyyaml 5.1.1
-
requests 2.22.0
-
requests 2.22.0
-
schema 0.6.8
-
schema 0.6.8
-
scikit-image 0.15.0
-
scikit-image 0.15.0
-
scikit-learn 0.21.2
-
scikit-learn 0.21.2
-
scipy 1.
3.0
-
scipy 1.
2.1
-
setuptools 41.0.1
-
setuptools 41.0.1
-
six 1.12.0
-
six 1.12.0
-
sox 14.4.2
-
sox 14.4.2
...
@@ -72,7 +74,7 @@ requirements:
...
@@ -72,7 +74,7 @@ requirements:
-
sqlalchemy 1.3.5
-
sqlalchemy 1.3.5
-
tabulate 0.8.3
-
tabulate 0.8.3
-
tensorflow 1.14.0
-
tensorflow 1.14.0
-
torchvision 0.
2.1
# [linux
and py<37
]
-
torchvision 0.
3.0
# [linux]
-
vlfeat 0.9.21
-
vlfeat 0.9.21
-
zc.buildout 2.12.2
-
zc.buildout 2.12.2
-
zc.recipe.egg 2.0.7
-
zc.recipe.egg 2.0.7
...
@@ -80,8 +82,6 @@ requirements:
...
@@ -80,8 +82,6 @@ requirements:
-
termcolor 1.1.0
-
termcolor 1.1.0
# semi-supported dependencies (drop them if they conflict):
# semi-supported dependencies (drop them if they conflict):
-
dlib
19.7
-
dlib
19.7
-
menpo 0.8.1
-
menpofit 0.5.0
run
:
run
:
-
python
-
python
run_constrained
:
run_constrained
:
...
...
This diff is collapsed.
Click to expand it.
conda_build_config.yaml
+
1
−
1
View file @
755f052c
...
@@ -43,7 +43,7 @@ zip_keys:
...
@@ -43,7 +43,7 @@ zip_keys:
-
python
# [win]
-
python
# [win]
numpy
:
numpy
:
-
1.16.
2
-
1.16.
4
boost
:
boost
:
-
1.67.0
-
1.67.0
cython
:
cython
:
...
...
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