Commit fd7ee253 authored by André Anjos's avatar André Anjos 💬
Browse files

Move py34 to py36 builds

parent 3460936e
......@@ -74,8 +74,6 @@ stages:
.docs_template: &docs_job
stage: docs
environment: intranet
only:
- master
before_script:
- ./_ci/install.sh _ci #updates
- ./_ci/before_docs.sh
......@@ -143,24 +141,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 +175,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 +211,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
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