Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use CircleCI Matrix Jobs #1105

Merged
merged 14 commits into from
Aug 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
102 changes: 31 additions & 71 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ executors:
parameters:
image_tag:
type: string
default: "3.7-stretch"
docker:
- image: circleci/python:<< parameters.image_tag >>

Expand All @@ -27,7 +26,6 @@ jobs:
parameters:
python_version:
type: string
default: "3.7"
miniconda_pkg_name:
type: string
default: "Miniconda3-4.7.12.1-Windows-x86_64.exe"
Expand Down Expand Up @@ -85,7 +83,6 @@ jobs:
parameters:
image_tag:
type: string
default: "3.7-stretch"
executor:
name: python
image_tag: << parameters.image_tag >>
Expand Down Expand Up @@ -126,10 +123,6 @@ jobs:
parameters:
image_tag:
type: string
default: "3.7-stretch"
codecov:
type: boolean
default: false
executor:
name: python
image_tag: << parameters.image_tag >>
Expand All @@ -139,7 +132,8 @@ jobs:
- attach_workspace:
at: ~/featuretools
- when:
condition: << parameters.codecov >>
condition:
equal: [ "3.6", << parameters.image_tag >> ]
steps:
- run: |
source venv/bin/activate
Expand All @@ -152,7 +146,8 @@ jobs:
cp unpacked_sdist/.coverage .coverage
codecov --required
- unless:
condition: << parameters.codecov >>
condition:
equal: [ "3.6", << parameters.image_tag >> ]
steps:
- run: |
source venv/bin/activate
Expand All @@ -164,7 +159,6 @@ jobs:
parameters:
image_tag:
type: string
default: "3.7-stretch"
executor:
name: python
image_tag: << parameters.image_tag >>
Expand All @@ -182,7 +176,6 @@ jobs:
parameters:
image_tag:
type: string
default: "3.8"
executor:
name: python
image_tag: << parameters.image_tag >>
Expand All @@ -204,7 +197,6 @@ jobs:
parameters:
image_tag:
type: string
default: "3.7-stretch"
executor:
name: python
image_tag: << parameters.image_tag >>
Expand Down Expand Up @@ -241,73 +233,41 @@ workflows:
test_all_python_versions:
jobs:
- win_unit_tests:
name: "py36 windows unit tests"
python_version: "3.6"
- win_unit_tests:
name: "py37 windows unit tests"
python_version: "3.7"
- win_unit_tests:
name: "py38 windows unit tests"
python_version: "3.8"
- install_ft:
name: "py36 install featuretools"
image_tag: "3.6"
matrix:
parameters:
python_version: ["3.8", "3.7", "3.6"]
name: py<< matrix.python_version >> windows unit tests
- install_ft:
name: "py37 install featuretools"
- install_ft:
name: "py38 install featuretools"
image_tag: "3.8"
matrix:
parameters:
image_tag: ["3.8", "3.7", "3.6"]
name: << matrix.image_tag >> install featuretools
- unit_tests:
name: "py36 unit tests"
image_tag: "3.6"
codecov: true
requires:
- "py36 install featuretools"
- unit_tests:
name: "py37 unit tests"
requires:
- "py37 install featuretools"
- unit_tests:
name: "py38 unit tests"
image_tag: "3.8"
requires:
- "py38 install featuretools"
- lint_test:
name: "py36 lint test"
image_tag: "3.6"
requires:
- "py36 install featuretools"
- lint_test:
name: "py37 lint test"
matrix:
parameters:
image_tag: ["3.8", "3.7", "3.6"]
name: << matrix.image_tag >> unit tests
requires:
- "py37 install featuretools"
- << matrix.image_tag >> install featuretools
- lint_test:
name: "py38 lint test"
image_tag: "3.8"
requires:
- "py38 install featuretools"
- build_docs:
name: "build docs 3.6"
image_tag: "3.6"
matrix:
parameters:
image_tag: ["3.8", "3.7", "3.6"]
name: << matrix.image_tag >> lint test
requires:
- "py36 install featuretools"
- << matrix.image_tag >> install featuretools
- build_docs:
name: "build docs 3.7"
image_tag: "3.7"
matrix:
parameters:
image_tag: ["3.8", "3.7", "3.6"]
name: build docs << matrix.image_tag >>
requires:
- "py37 install featuretools"
- build_docs:
name: "build docs 3.8"
requires:
- "py38 install featuretools"
- install_ft_complete:
name: "py36 install featuretools complete test"
image_tag: "3.6"
- install_ft_complete:
name: "py37 install featuretools complete test"
- << matrix.image_tag >> install featuretools
- install_ft_complete:
name: "py38 install featuretools complete test"
image_tag: "3.8"
matrix:
parameters:
image_tag: ["3.8", "3.7", "3.6"]
name: << matrix.image_tag >> install featuretools complete test
- changelog_updated:
name: "changelog updated"
filters:
Expand Down
6 changes: 4 additions & 2 deletions docs/source/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,17 @@

Changelog
---------
.. **Future Release**
**Future Release**
* Enhancements
* Fixes
* Fix ``EntitySet.plot()`` when given a dask entityset (:pr:`1086`)
* Changes
* Documentation Changes
* Testing Changes
* Use CircleCI matrix jobs in config to trigger multiple runs of same job with different parameters (:pr:`1105`)

Thanks to the following people for contributing to this release:
:user:`systemshift`,
:user:`systemshift`, :user:`gsheni`,

**v0.18.0 July 31, 2020**
* Enhancements
Expand Down