Commit 777bdb63 authored by Amir MOHAMMADI's avatar Amir MOHAMMADI
Browse files

Merge branch 'python36'

parents c1fa5a52 7e0f3d35
Pipeline #9651 passed with stages
in 13 minutes and 48 seconds
......@@ -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
......@@ -7,6 +7,8 @@
:target: https://www.idiap.ch/software/bob/docs/latest/bob/gridtk/master/index.html
.. image:: https://gitlab.idiap.ch/bob/gridtk/badges/master/build.svg
:target: https://gitlab.idiap.ch/bob/gridtk/commits/master
.. image:: https://gitlab.idiap.ch/bob/gridtk/badges/master/coverage.svg
:target: https://gitlab.idiap.ch/bob/gridtk/commits/master
.. image:: https://img.shields.io/badge/gitlab-project-0000c0.svg
:target: https://gitlab.idiap.ch/bob/gridtk
.. image:: http://img.shields.io/pypi/v/gridtk.svg
......@@ -34,7 +36,8 @@ local machine, using a simple scheduling system.
Installation
------------
Follow our `installation`_ instructions. Then, to install this package, run::
Complete Bob's `installation`_ instructions. Then, to install this pacakge,
run::
$ conda install gridtk
......
......@@ -231,7 +231,6 @@ autodoc_member_order = 'bysource'
autodoc_default_flags = [
'members',
'undoc-members',
'inherited-members',
'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