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
Merge requests
!80
Update bob devel / pin conda to 4.6
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Update bob devel / pin conda to 4.6
update-bob-devel
into
master
Overview
0
Commits
3
Pipelines
1
Changes
3
Merged
André Anjos
requested to merge
update-bob-devel
into
master
5 years ago
Overview
0
Commits
3
Pipelines
1
Changes
3
Expand
This MR addresses two issues:
It pins conda to 4.6 when installing/building bob.devtools. This fixes an issue updating bob.devtools once conda=4.7.x is installed
It brings back menpofit to the list of supported software until second notice. Otherwise, bob.ip.facelandmarks does not build
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
68db458c
3 commits,
5 years ago
3 files
+
7
−
5
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
3
Search (e.g. *.vue) (Ctrl+P)
bob/devtools/data/conda_build_config.yaml
+
4
−
2
Options
@@ -51,12 +51,12 @@ zip_keys:
# This version of bob-devel will be used at test time of packages:
bob_devel
:
-
2019.0
7.31
-
2019.0
8.04
# This version of beat-devel will be used at test time of packages. Notice it
# uses bob-devel and should have a version that is greater or equal its value
beat_devel
:
-
2019.0
7.31
-
2019.0
8.04
# The build time only dependencies (build requirements).
# Updating these to the latest version all the time is OK and a good idea.
@@ -146,6 +146,8 @@ matplotlib:
-
3.0.3
menpo
:
-
0.8.1
menpofit
:
-
0.5.0
mido
:
-
1.2.9
mne
:
Loading