diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fa11e075cc0fd8c54733fead8bc84daabc081f0b..6489c109f75951127ce5701f50389680dea3b440 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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_34: +# Mac OSX + Python 3.5: Builds and tests +build_macosx_35: <<: *build_job - variables: &macosx_34_build_variables - PYTHON_VERSION: "3.4" + variables: &macosx_35_build_variables + PYTHON_VERSION: "3.5" WHEEL_TAG: "py3" tags: - conda-macosx -test_macosx_34: +test_macosx_35: <<: *test_job - variables: *macosx_34_build_variables + variables: *macosx_35_build_variables dependencies: - - build_macosx_34 + - build_macosx_35 tags: - conda-macosx -# Mac OSX + Python 3.5: Builds and tests -build_macosx_35: +# Mac OSX + Python 3.6: Builds and tests +build_macosx_36: <<: *build_job - variables: &macosx_35_build_variables - PYTHON_VERSION: "3.5" + variables: &macosx_36_build_variables + PYTHON_VERSION: "3.6" WHEEL_TAG: "py3" tags: - conda-macosx -test_macosx_35: +test_macosx_36: <<: *test_job - variables: *macosx_35_build_variables + variables: *macosx_36_build_variables dependencies: - - build_macosx_35 + - build_macosx_36 tags: - conda-macosx diff --git a/README.rst b/README.rst index 7ff27083157c13110357842aead3e8da13403f2b..cdac828eb3e3dcb946684118246f940c5cc0e103 100644 --- a/README.rst +++ b/README.rst @@ -7,6 +7,8 @@ :target: https://www.idiap.ch/software/bob/docs/latest/bob/bob.ip.facelandmarks/master/index.html .. image:: https://gitlab.idiap.ch/bob/bob.ip.facelandmarks/badges/master/build.svg :target: https://gitlab.idiap.ch/bob/bob.ip.facelandmarks/commits/master +.. image:: https://gitlab.idiap.ch/bob/bob.ip.facelandmarks/badges/master/coverage.svg + :target: https://gitlab.idiap.ch/bob/bob.ip.facelandmarks/commits/master .. image:: https://img.shields.io/badge/gitlab-project-0000c0.svg :target: https://gitlab.idiap.ch/bob/bob.ip.facelandmarks .. image:: http://img.shields.io/pypi/v/bob.ip.facelandmarks.svg @@ -27,11 +29,10 @@ detection library) via Bob. 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.ip.facelandmarks Contact diff --git a/doc/conf.py b/doc/conf.py index ec09031d2525923a9b6fe549bf81f0710ae463d2..aeb8ef0d48db3f30ae02b1214c4652f2d0f765be 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -232,7 +232,6 @@ autodoc_member_order = 'bysource' autodoc_default_flags = [ 'members', 'undoc-members', - 'inherited-members', 'show-inheritance', ]