Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
bob
bob.bio.base
Commits
b79c855e
Commit
b79c855e
authored
May 28, 2017
by
Amir MOHAMMADI
Browse files
Merge branch 'python36'
parents
b9402ce7
e80be9d3
Pipeline
#9691
passed with stages
in 22 minutes and 27 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
b79c855e
...
...
@@ -143,24 +143,6 @@ deploy_linux_27:
-
conda-linux
# Linux + Python 3.4: Builds and tests
build_linux_34
:
<<
:
*build_job
variables
:
&linux_34_build_variables
PYTHON_VERSION
:
"
3.4"
WHEEL_TAG
:
"
py3"
tags
:
-
conda-linux
test_linux_34
:
<<
:
*test_job
variables
:
*linux_34_build_variables
dependencies
:
-
build_linux_34
tags
:
-
conda-linux
# Linux + Python 3.5: Builds, tests and uploads wheel
build_linux_35
:
<<
:
*build_job
...
...
@@ -195,6 +177,24 @@ docs_linux_35:
-
conda-linux
# Linux + Python 3.6: Builds and tests
build_linux_36
:
<<
:
*build_job
variables
:
&linux_36_build_variables
PYTHON_VERSION
:
"
3.6"
WHEEL_TAG
:
"
py3"
tags
:
-
conda-linux
test_linux_36
:
<<
:
*test_job
variables
:
*linux_36_build_variables
dependencies
:
-
build_linux_36
tags
:
-
conda-linux
# Mac OSX + Python 2.7: Builds and tests
build_macosx_27
:
<<
:
*build_job
...
...
@@ -213,37 +213,37 @@ test_macosx_27:
-
conda-macosx
# Mac OSX + Python 3.
4
: Builds and tests
build_macosx_3
4
:
# Mac OSX + Python 3.
5
: Builds and tests
build_macosx_3
5
:
<<
:
*build_job
variables
:
&macosx_3
4
_build_variables
PYTHON_VERSION
:
"
3.
4
"
variables
:
&macosx_3
5
_build_variables
PYTHON_VERSION
:
"
3.
5
"
WHEEL_TAG
:
"
py3"
tags
:
-
conda-macosx
test_macosx_3
4
:
test_macosx_3
5
:
<<
:
*test_job
variables
:
*macosx_3
4
_build_variables
variables
:
*macosx_3
5
_build_variables
dependencies
:
-
build_macosx_3
4
-
build_macosx_3
5
tags
:
-
conda-macosx
# Mac OSX + Python 3.
5
: Builds and tests
build_macosx_3
5
:
# Mac OSX + Python 3.
6
: Builds and tests
build_macosx_3
6
:
<<
:
*build_job
variables
:
&macosx_3
5
_build_variables
PYTHON_VERSION
:
"
3.
5
"
variables
:
&macosx_3
6
_build_variables
PYTHON_VERSION
:
"
3.
6
"
WHEEL_TAG
:
"
py3"
tags
:
-
conda-macosx
test_macosx_3
5
:
test_macosx_3
6
:
<<
:
*test_job
variables
:
*macosx_3
5
_build_variables
variables
:
*macosx_3
6
_build_variables
dependencies
:
-
build_macosx_3
5
-
build_macosx_3
6
tags
:
-
conda-macosx
README.rst
View file @
b79c855e
...
...
@@ -7,6 +7,8 @@
:target: https://www.idiap.ch/software/bob/docs/latest/bioidiap/bob.bio.base/master/index.html
.. image:: https://gitlab.idiap.ch/bob/bob.bio.base/badges/master/build.svg
:target: https://gitlab.idiap.ch/bob/bob.bio.base/commits/master
.. image:: https://gitlab.idiap.ch/bob/bob.bio.base/badges/master/coverage.svg
:target: https://gitlab.idiap.ch/bob/bob.bio.base/commits/master
.. image:: https://img.shields.io/badge/gitlab-project-0000c0.svg
:target: https://gitlab.idiap.ch/bob/bob.bio.base
.. image:: http://img.shields.io/pypi/v/bob.bio.base.svg
...
...
@@ -29,11 +31,10 @@ The `User Guide`_ provides installation and usage instructions.
Installation
------------
Follow our
`installation`_ instructions. Then,
using the Python interpreter
provided by the distribution, bootstrap and buildout this package
::
Complete Bob's
`installation`_ instructions. Then,
to install this pacakge,
run
::
$ python bootstrap-buildout.py
$ ./bin/buildout
$ conda install bob.bio.base
Contact
...
...
bob/bio/base/database/database.py
View file @
b79c855e
...
...
@@ -760,7 +760,7 @@ class ZTBioDatabase(BioDatabase):
def
client_id_from_t_model_id
(
self
,
t_model_id
,
group
=
'dev'
):
"""client_id_from_t_model_id(t_model_id, group = 'dev') -> client_id
Returns the client id for the given T-Norm model id.
In this base class implementation, we just use the :py:meth:`client_id_from_model_id` function.
In this base class implementation, we just use the :py:meth:`
BioDatabase.
client_id_from_model_id` function.
Overload this function if you need another behavior.
**Parameters:**
...
...
doc/conf.py
View file @
b79c855e
...
...
@@ -229,7 +229,6 @@ autodoc_member_order = 'bysource'
autodoc_default_flags
=
[
'members'
,
'undoc-members'
,
'inherited-members'
,
'show-inheritance'
,
]
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment