Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
bob.ip.flandmark
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.ip.flandmark
Commits
8b29e174
Commit
8b29e174
authored
10 years ago
by
Manuel Günther
Browse files
Options
Downloads
Patches
Plain Diff
Fixed issue when OpenCV library is not available.
parent
8876219f
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.travis.yml
+1
-1
1 addition, 1 deletion
.travis.yml
setup.py
+10
-1
10 additions, 1 deletion
setup.py
with
11 additions
and
2 deletions
.travis.yml
+
1
−
1
View file @
8b29e174
...
@@ -22,7 +22,7 @@ before_install:
...
@@ -22,7 +22,7 @@ before_install:
-
if [ -n "${NUMPYSPEC}" ]; then sudo apt-get install -qq --force-yes libatlas-dev libatlas-base-dev liblapack-dev gfortran; fi
-
if [ -n "${NUMPYSPEC}" ]; then sudo apt-get install -qq --force-yes libatlas-dev libatlas-base-dev liblapack-dev gfortran; fi
-
if [ -n "${NUMPYSPEC}" ]; then pip install --upgrade pip setuptools; fi
-
if [ -n "${NUMPYSPEC}" ]; then pip install --upgrade pip setuptools; fi
-
if [ -n "${NUMPYSPEC}" ]; then pip install --find-links http://wheels.astropy.org/ --find-links http://wheels2.astropy.org/ --use-wheel numpy$NUMPYSPEC; fi
-
if [ -n "${NUMPYSPEC}" ]; then pip install --find-links http://wheels.astropy.org/ --find-links http://wheels2.astropy.org/ --use-wheel numpy$NUMPYSPEC; fi
-
pip install --find-links http://wheels.astropy.org/ --find-links http://wheels2.astropy.org/ --use-wheel matplotlib==1.3.0 sphinx nose==1.3.0 jinja2==2.6 cpp-coveralls pygments==1.6 setuptools==
7
.0
-
pip install --find-links http://wheels.astropy.org/ --find-links http://wheels2.astropy.org/ --use-wheel matplotlib==1.3.0 sphinx nose==1.3.0 jinja2==2.6 cpp-coveralls pygments==1.6 setuptools==
8
.0
install
:
install
:
-
python bootstrap.py
-
python bootstrap.py
-
CFLAGS=-coverage ./bin/buildout
-
CFLAGS=-coverage ./bin/buildout
...
...
This diff is collapsed.
Click to expand it.
setup.py
+
10
−
1
View file @
8b29e174
...
@@ -18,9 +18,18 @@ build_requires = load_requirements()
...
@@ -18,9 +18,18 @@ build_requires = load_requirements()
# Define package version
# Define package version
version
=
open
(
"
version.txt
"
).
read
().
rstrip
()
version
=
open
(
"
version.txt
"
).
read
().
rstrip
()
packages
=
[
'
boost
'
,
'
opencv>=2.0
'
]
packages
=
[
'
boost
'
]
boost_modules
=
[
'
system
'
]
boost_modules
=
[
'
system
'
]
# check if opencv is available
try
:
from
bob.extension
import
check_packages
pkg
=
check_packages
([
'
opencv>=2.0
'
])
print
(
"
Found OpenCV libraries %s
"
%
pkg
[
0
].
libraries
())
packages
.
append
(
'
opencv>=2.0
'
)
except
RuntimeError
as
e
:
print
(
"
OpenCV was not found, it will not be availabe during tests
"
)
setup
(
setup
(
name
=
"
bob.ip.flandmark
"
,
name
=
"
bob.ip.flandmark
"
,
...
...
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