Merge branch 'python36' into 'master'

modified README, updated conf.py

See merge request !4

.gitlab-ci.yml

@@ -142,40 +142,6 @@ deploy_linux_27:
   tags:
     - conda-linux
 
-# Linux + Python 3.4: Builds, tests and uploads wheel
-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
-
-wheels_linux_34:
-  <<: *wheels_job
-  variables: *linux_34_build_variables
-  dependencies:
-    - build_linux_34
-  tags:
-    - conda-linux
-
-docs_linux_34:
-  <<: *docs_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:
@@ -211,73 +177,19 @@ 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
-#   variables: &macosx_27_build_variables
-#     PYTHON_VERSION: "2.7"
-#     WHEEL_TAG: "py27"
-#   tags:
-#     - conda-macosx
-
-# test_macosx_27:
-#   <<: *test_job
-#   variables: *macosx_27_build_variables
-#   dependencies:
-#     - build_macosx_27
-#   tags:
-#     - conda-macosx
-
-
-# # Mac OSX + Python 3.5: Builds and tests
-# build_macosx_35:
-#   <<: *build_job
-#   variables: &macosx_35_build_variables
-#     PYTHON_VERSION: "3.5"
-#     WHEEL_TAG: "py3"
-#   tags:
-#     - conda-macosx
-
-# test_macosx_35:
-#   <<: *test_job
-#   variables: *macosx_35_build_variables
-#   dependencies:
-#     - build_macosx_35
-#   tags:
-#     - conda-macosx
-
-
-# # Mac OSX + Python 3.6: Builds and tests
-# build_macosx_36:
-#   <<: *build_job
-#   variables: &macosx_36_build_variables
-#     PYTHON_VERSION: "3.6"
-#     WHEEL_TAG: "py3"
-#   tags:
-#     - conda-macosx
+# 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_macosx_36:
-#   <<: *test_job
-#   variables: *macosx_36_build_variables
-#   dependencies:
-#     - build_macosx_36
-#   tags:
-#     - conda-macosx
+test_linux_36:
+  <<: *test_job
+  variables: *linux_36_build_variables
+  dependencies:
+    - build_linux_36
+  tags:
+    - conda-linux
\ No newline at end of file

README.rst

@@ -8,6 +8,8 @@
    :target: https://www.idiap.ch/software/bob/docs/latest/bob/bob.kaldi/master/index.html
 .. image:: https://gitlab.idiap.ch/bob/bob.kaldi/badges/master/build.svg
    :target: https://gitlab.idiap.ch/bob/bob.kaldi/commits/master
+.. image:: https://gitlab.idiap.ch/bob/bob.kaldi/badges/master/coverage.svg
+   :target: https://gitlab.idiap.ch/bob/bob.kaldi/commits/master
 .. image:: https://img.shields.io/badge/gitlab-project-0000c0.svg
    :target: https://gitlab.idiap.ch/bob/bob.kaldi
 .. image:: http://img.shields.io/pypi/v/bob.kaldi.svg

doc/conf.py

@@ -232,7 +232,6 @@ autodoc_member_order = 'bysource'
 autodoc_default_flags = [
   'members',
   'undoc-members',
-  'inherited-members',
   'show-inheritance',
   ]