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
82ec807c
There was a problem fetching the pipeline summary.
Commit
82ec807c
authored
7 years ago
by
Amir MOHAMMADI
Browse files
Options
Downloads
Plain Diff
Merge branch 'issue-55' into 'master'
Closes
#55
Closes
#55
See merge request bob/bob.conda!353
parents
b68d46a9
18f7bdaa
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!353
Closes #55
Pipeline
#
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
conda/bob-devel/meta.yaml
+1
-1
1 addition, 1 deletion
conda/bob-devel/meta.yaml
conda/menpo/meta.yaml
+3
-1
3 additions, 1 deletion
conda/menpo/meta.yaml
conda/menpo/no-scipy-pin.patch
+13
-0
13 additions, 0 deletions
conda/menpo/no-scipy-pin.patch
with
17 additions
and
2 deletions
conda/bob-devel/meta.yaml
+
1
−
1
View file @
82ec807c
package
:
package
:
name
:
bob-devel
name
:
bob-devel
version
:
2018.04.1
1
version
:
2018.04.1
2
build
:
build
:
number
:
0
number
:
0
...
...
This diff is collapsed.
Click to expand it.
conda/menpo/meta.yaml
+
3
−
1
View file @
82ec807c
...
@@ -11,13 +11,15 @@ source:
...
@@ -11,13 +11,15 @@ source:
url
:
https://github.com/menpo/menpo/archive/v{{ version }}.tar.gz
url
:
https://github.com/menpo/menpo/archive/v{{ version }}.tar.gz
sha256
:
{{
sha256
}}
sha256
:
{{
sha256
}}
patches
:
patches
:
# removes the pinning for scipy<1
-
no-scipy-pin.patch
# removes the pinning for matplotlib<2
# removes the pinning for matplotlib<2
-
no-matplotlib-pin.patch
-
no-matplotlib-pin.patch
# relaxes the pathlib pinning for python 2.x
# relaxes the pathlib pinning for python 2.x
-
relax-pathlib-pin.patch
-
relax-pathlib-pin.patch
build
:
build
:
number
:
3
number
:
4
script
:
python setup.py install --single-version-externally-managed --record=record.txt
script
:
python setup.py install --single-version-externally-managed --record=record.txt
run_exports
:
run_exports
:
-
{{
pin_subpackage(name
,
max_pin='x.x')
}}
-
{{
pin_subpackage(name
,
max_pin='x.x')
}}
...
...
This diff is collapsed.
Click to expand it.
conda/menpo/no-scipy-pin.patch
0 → 100644
+
13
−
0
View file @
82ec807c
diff --git a/setup.py b/setup.py
index dc348290..6b4145d6 100644
--- a/setup.py
+++ b/setup.py
@@ -100,7 +100,7 @@
cython_exts = cythonize(cython_modules, quiet=True)
# Please see conda/meta.yaml for other binary dependencies
install_requires = ['numpy>=1.10,<2.0',
- 'scipy>=0.16,<1.0',
+ 'scipy>=0.16',
'matplotlib>=1.4,<3.0',
'pillow>=3.0,<5.0']
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