Commit 5a75366c authored by Amir MOHAMMADI's avatar Amir MOHAMMADI

Merge branch 'python36'

parents 834b46a2 d33d3208
Pipeline #9628 passed with stages
in 13 minutes and 56 seconds
...@@ -142,31 +142,6 @@ deploy_linux_27: ...@@ -142,31 +142,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"
tags:
- conda-linux
test_linux_34:
<<: *test_job
variables: *linux_34_build_variables
dependencies:
- build_linux_34
tags:
- conda-linux
wheels_linux_34:
<<: *wheels_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
...@@ -200,6 +175,31 @@ docs_linux_35: ...@@ -200,6 +175,31 @@ 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"
tags:
- conda-linux
test_linux_36:
<<: *test_job
variables: *linux_36_build_variables
dependencies:
- build_linux_36
tags:
- conda-linux
wheels_linux_36:
<<: *wheels_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
...@@ -225,51 +225,51 @@ wheels_macosx_27: ...@@ -225,51 +225,51 @@ wheels_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"
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
wheels_macosx_34: wheels_macosx_35:
<<: *wheels_job <<: *wheels_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"
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
wheels_macosx_35: wheels_macosx_36:
<<: *wheels_job <<: *wheels_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
include LICENSE README.rst bootstrap-buildout.py buildout.cfg develop.cfg requirements.txt version.txt include LICENSE README.rst buildout.cfg develop.cfg requirements.txt version.txt
recursive-include doc conf.py *.rst recursive-include doc conf.py *.rst
recursive-include bob *.h *.cpp recursive-include bob *.h *.cpp
recursive-include bob/measure/data *.* recursive-include bob/measure/data *.*
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
:target: https://www.idiap.ch/software/bob/docs/latest/bob/bob.measure/master/index.html :target: https://www.idiap.ch/software/bob/docs/latest/bob/bob.measure/master/index.html
.. image:: https://gitlab.idiap.ch/bob/bob.measure/badges/master/build.svg .. image:: https://gitlab.idiap.ch/bob/bob.measure/badges/master/build.svg
:target: https://gitlab.idiap.ch/bob/bob.measure/commits/master :target: https://gitlab.idiap.ch/bob/bob.measure/commits/master
.. image:: https://gitlab.idiap.ch/bob/bob.measure/badges/master/coverage.svg
:target: https://gitlab.idiap.ch/bob/bob.measure/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.measure :target: https://gitlab.idiap.ch/bob/bob.measure
.. image:: http://img.shields.io/pypi/v/bob.measure.svg .. image:: http://img.shields.io/pypi/v/bob.measure.svg
...@@ -27,11 +29,10 @@ experiments. ...@@ -27,11 +29,10 @@ experiments.
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.measure
$ ./bin/buildout
Contact Contact
......
...@@ -232,7 +232,6 @@ autodoc_member_order = 'bysource' ...@@ -232,7 +232,6 @@ autodoc_member_order = 'bysource'
autodoc_default_flags = [ autodoc_default_flags = [
'members', 'members',
'undoc-members', 'undoc-members',
'inherited-members',
'show-inheritance', 'show-inheritance',
] ]
......
Markdown is supported
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