Commit b79c855e authored by Amir MOHAMMADI's avatar Amir MOHAMMADI
Browse files

Merge branch 'python36'

parents b9402ce7 e80be9d3
Pipeline #9691 passed with stages
in 22 minutes and 27 seconds
...@@ -143,24 +143,6 @@ deploy_linux_27: ...@@ -143,24 +143,6 @@ deploy_linux_27:
- conda-linux - 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 # Linux + Python 3.5: Builds, tests and uploads wheel
build_linux_35: build_linux_35:
<<: *build_job <<: *build_job
...@@ -195,6 +177,24 @@ docs_linux_35: ...@@ -195,6 +177,24 @@ docs_linux_35:
- conda-linux - 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 # Mac OSX + Python 2.7: Builds and tests
build_macosx_27: build_macosx_27:
<<: *build_job <<: *build_job
...@@ -213,37 +213,37 @@ test_macosx_27: ...@@ -213,37 +213,37 @@ test_macosx_27:
- conda-macosx - conda-macosx
# Mac OSX + Python 3.4: Builds and tests # Mac OSX + Python 3.5: Builds and tests
build_macosx_34: build_macosx_35:
<<: *build_job <<: *build_job
variables: &macosx_34_build_variables variables: &macosx_35_build_variables
PYTHON_VERSION: "3.4" PYTHON_VERSION: "3.5"
WHEEL_TAG: "py3" WHEEL_TAG: "py3"
tags: tags:
- conda-macosx - conda-macosx
test_macosx_34: test_macosx_35:
<<: *test_job <<: *test_job
variables: *macosx_34_build_variables variables: *macosx_35_build_variables
dependencies: dependencies:
- build_macosx_34 - build_macosx_35
tags: tags:
- conda-macosx - conda-macosx
# Mac OSX + Python 3.5: Builds and tests # Mac OSX + Python 3.6: Builds and tests
build_macosx_35: build_macosx_36:
<<: *build_job <<: *build_job
variables: &macosx_35_build_variables variables: &macosx_36_build_variables
PYTHON_VERSION: "3.5" PYTHON_VERSION: "3.6"
WHEEL_TAG: "py3" WHEEL_TAG: "py3"
tags: tags:
- conda-macosx - conda-macosx
test_macosx_35: test_macosx_36:
<<: *test_job <<: *test_job
variables: *macosx_35_build_variables variables: *macosx_36_build_variables
dependencies: dependencies:
- build_macosx_35 - build_macosx_36
tags: tags:
- conda-macosx - conda-macosx
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
:target: https://www.idiap.ch/software/bob/docs/latest/bioidiap/bob.bio.base/master/index.html :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 .. image:: https://gitlab.idiap.ch/bob/bob.bio.base/badges/master/build.svg
:target: https://gitlab.idiap.ch/bob/bob.bio.base/commits/master :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 .. image:: https://img.shields.io/badge/gitlab-project-0000c0.svg
:target: https://gitlab.idiap.ch/bob/bob.bio.base :target: https://gitlab.idiap.ch/bob/bob.bio.base
.. image:: http://img.shields.io/pypi/v/bob.bio.base.svg .. image:: http://img.shields.io/pypi/v/bob.bio.base.svg
...@@ -29,11 +31,10 @@ The `User Guide`_ provides installation and usage instructions. ...@@ -29,11 +31,10 @@ The `User Guide`_ provides installation and usage instructions.
Installation Installation
------------ ------------
Follow our `installation`_ instructions. Then, using the Python interpreter Complete Bob's `installation`_ instructions. Then, to install this pacakge,
provided by the distribution, bootstrap and buildout this package:: run::
$ python bootstrap-buildout.py $ conda install bob.bio.base
$ ./bin/buildout
Contact Contact
......
...@@ -760,7 +760,7 @@ class ZTBioDatabase(BioDatabase): ...@@ -760,7 +760,7 @@ class ZTBioDatabase(BioDatabase):
def client_id_from_t_model_id(self, t_model_id, group='dev'): 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 """client_id_from_t_model_id(t_model_id, group = 'dev') -> client_id
Returns the client id for the given T-Norm model 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. Overload this function if you need another behavior.
**Parameters:** **Parameters:**
......
...@@ -229,7 +229,6 @@ autodoc_member_order = 'bysource' ...@@ -229,7 +229,6 @@ autodoc_member_order = 'bysource'
autodoc_default_flags = [ autodoc_default_flags = [
'members', 'members',
'undoc-members', 'undoc-members',
'inherited-members',
'show-inheritance', 'show-inheritance',
] ]
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment