Unverified Commit 35899095 authored by jamarshon's avatar jamarshon Committed by GitHub
Browse files

Revert "CI Fix: Remove Python 3.7" (#238)

* Revert "CI Fix: Remove Python 3.7 (#232)"

This reverts commit 7b54714d.

* apply feedback
parent 7b54714d
...@@ -173,6 +173,9 @@ workflows: ...@@ -173,6 +173,9 @@ workflows:
- binary_linux_wheel: - binary_linux_wheel:
name: binary_linux_wheel_py3.6 name: binary_linux_wheel_py3.6
python_version: "3.6" python_version: "3.6"
- binary_linux_wheel:
name: binary_linux_wheel_py3.7
python_version: "3.7"
- binary_macos_wheel: - binary_macos_wheel:
name: binary_macos_wheel_py2.7 name: binary_macos_wheel_py2.7
python_version: "2.7" python_version: "2.7"
...@@ -186,6 +189,9 @@ workflows: ...@@ -186,6 +189,9 @@ workflows:
- binary_macos_wheel: - binary_macos_wheel:
name: binary_macos_wheel_py3.6 name: binary_macos_wheel_py3.6
python_version: "3.6" python_version: "3.6"
- binary_macos_wheel:
name: binary_macos_wheel_py3.7
python_version: "3.7"
- binary_linux_conda: - binary_linux_conda:
name: binary_linux_conda_py2.7 name: binary_linux_conda_py2.7
python_version: "2.7" python_version: "2.7"
...@@ -195,6 +201,9 @@ workflows: ...@@ -195,6 +201,9 @@ workflows:
- binary_linux_conda: - binary_linux_conda:
name: binary_linux_conda_py3.6 name: binary_linux_conda_py3.6
python_version: "3.6" python_version: "3.6"
- binary_linux_conda:
name: binary_linux_conda_py3.7
python_version: "3.7"
- binary_macos_conda: - binary_macos_conda:
name: binary_macos_conda_py2.7 name: binary_macos_conda_py2.7
python_version: "2.7" python_version: "2.7"
...@@ -204,6 +213,9 @@ workflows: ...@@ -204,6 +213,9 @@ workflows:
- binary_macos_conda: - binary_macos_conda:
name: binary_macos_conda_py3.6 name: binary_macos_conda_py3.6
python_version: "3.6" python_version: "3.6"
- binary_macos_conda:
name: binary_macos_conda_py3.7
python_version: "3.7"
nightly: nightly:
triggers: triggers:
...@@ -249,6 +261,14 @@ workflows: ...@@ -249,6 +261,14 @@ workflows:
context: org-member context: org-member
requires: requires:
- nightly_binary_linux_wheel_py3.6 - nightly_binary_linux_wheel_py3.6
- binary_linux_wheel:
name: nightly_binary_linux_wheel_py3.7
python_version: "3.7"
- binary_wheel_upload:
name: nightly_binary_linux_wheel_py3.7_upload
context: org-member
requires:
- nightly_binary_linux_wheel_py3.7
- binary_macos_wheel: - binary_macos_wheel:
name: nightly_binary_macos_wheel_py2.7 name: nightly_binary_macos_wheel_py2.7
python_version: "2.7" python_version: "2.7"
...@@ -282,6 +302,14 @@ workflows: ...@@ -282,6 +302,14 @@ workflows:
context: org-member context: org-member
requires: requires:
- nightly_binary_macos_wheel_py3.6 - nightly_binary_macos_wheel_py3.6
- binary_macos_wheel:
name: nightly_binary_macos_wheel_py3.7
python_version: "3.7"
- binary_wheel_upload:
name: nightly_binary_macos_wheel_py3.7_upload
context: org-member
requires:
- nightly_binary_macos_wheel_py3.7
- binary_linux_conda: - binary_linux_conda:
name: nightly_binary_linux_conda_py2.7 name: nightly_binary_linux_conda_py2.7
python_version: "2.7" python_version: "2.7"
...@@ -306,6 +334,14 @@ workflows: ...@@ -306,6 +334,14 @@ workflows:
context: org-member context: org-member
requires: requires:
- nightly_binary_linux_conda_py3.6 - nightly_binary_linux_conda_py3.6
- binary_linux_conda:
name: nightly_binary_linux_conda_py3.7
python_version: "3.7"
- binary_conda_upload:
name: nightly_binary_linux_conda_py3.7_upload
context: org-member
requires:
- nightly_binary_linux_conda_py3.7
- binary_macos_conda: - binary_macos_conda:
name: nightly_binary_macos_conda_py2.7 name: nightly_binary_macos_conda_py2.7
python_version: "2.7" python_version: "2.7"
...@@ -330,3 +366,11 @@ workflows: ...@@ -330,3 +366,11 @@ workflows:
context: org-member context: org-member
requires: requires:
- nightly_binary_macos_conda_py3.6 - nightly_binary_macos_conda_py3.6
- binary_macos_conda:
name: nightly_binary_macos_conda_py3.7
python_version: "3.7"
- binary_conda_upload:
name: nightly_binary_macos_conda_py3.7_upload
context: org-member
requires:
- nightly_binary_macos_conda_py3.7
\ No newline at end of file
...@@ -176,7 +176,7 @@ jobs: ...@@ -176,7 +176,7 @@ jobs:
{%- macro workflows(prefix='', upload=False) %} {%- macro workflows(prefix='', upload=False) %}
{%- for btype in ["wheel", "conda"] -%} {%- for btype in ["wheel", "conda"] -%}
{%- for os in ["linux", "macos"] -%} {%- for os in ["linux", "macos"] -%}
{%- for python_version in ["2.7", "3.5", "3.6"] -%} {%- for python_version in ["2.7", "3.5", "3.6", "3.7"] -%}
{%- for unicode in ([False, True] if btype == "wheel" and python_version == "2.7" else [False]) -%} {%- for unicode in ([False, True] if btype == "wheel" and python_version == "2.7" else [False]) -%}
{{ workflow(btype, os, python_version, unicode, prefix=prefix, upload=upload) }} {{ workflow(btype, os, python_version, unicode, prefix=prefix, upload=upload) }}
{%- endfor -%} {%- endfor -%}
......
...@@ -12,6 +12,7 @@ cache: ...@@ -12,6 +12,7 @@ cache:
matrix: matrix:
fast_finish: true fast_finish: true
include: include:
- env: PYTHON_VERSION="3.7"
- env: PYTHON_VERSION="3.6" - env: PYTHON_VERSION="3.6"
# TODO add this back in when there is a pytorch 1.2 for python 3.5 # TODO add this back in when there is a pytorch 1.2 for python 3.5
- env: PYTHON_VERSION="3.5" RUN_FLAKE8="true" SKIP_TESTS="true" - env: PYTHON_VERSION="3.5" RUN_FLAKE8="true" SKIP_TESTS="true"
......
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