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
508b5df6
There was a problem fetching the pipeline summary.
Commit
508b5df6
authored
6 years ago
by
André Anjos
Browse files
Options
Downloads
Patches
Plain Diff
Relax pinning in menpo
parent
9adb02d5
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!374
Relax pinning in menpo
Pipeline
#
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
conda/menpo/meta.yaml
+1
-1
1 addition, 1 deletion
conda/menpo/meta.yaml
conda/menpo/relax-pins.patch
+7
-4
7 additions, 4 deletions
conda/menpo/relax-pins.patch
with
8 additions
and
5 deletions
conda/menpo/meta.yaml
+
1
−
1
View file @
508b5df6
...
...
@@ -17,7 +17,7 @@ source:
-
relax-pins.patch
build
:
number
:
5
number
:
6
script
:
python setup.py install --single-version-externally-managed --record=record.txt
run_exports
:
-
{{
pin_subpackage(name
,
max_pin='x.x')
}}
...
...
This diff is collapsed.
Click to expand it.
conda/menpo/relax-pins.patch
+
7
−
4
View file @
508b5df6
diff --git a/setup.py b/setup.py
index 17cae557..
6c7b17ff
100644
index 17cae557..
995d375d
100644
--- a/setup.py
+++ b/setup.py
@@ -90,12 +90,12 @@
cython_exts = cythonize(cython_modules, quiet=True)
@@ -89,13 +89,13 @@
cython_exts = cythonize(cython_modules, quiet=True)
# Please see conda/meta.yaml for other binary dependencies
install_requires = ['numpy>=1.10,<2.0',
-
install_requires = ['numpy>=1.10,<2.0',
- 'scipy>=0.16,<1.0',
- 'matplotlib>=1.4,<2.0',
- 'pillow>=3.0,<5.0']
+install_requires = ['numpy>=1.10',
+ 'scipy>=0.16',
+ 'matplotlib>=1.4',
'pillow>=3.0
,<5.0
']
+
'pillow>=3.0']
if sys.version_info.major == 2:
- install_requires.append('pathlib==1.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