Skip to content

Commit

Permalink
Drop 3.5 and start testing for 3.9 (#459)
Browse files Browse the repository at this point in the history
update CI files for Tox, Azure pipelines, and CircleCI
  • Loading branch information
ajtritt committed Nov 12, 2020
1 parent 7297460 commit 2c14a33
Show file tree
Hide file tree
Showing 3 changed files with 98 additions and 97 deletions.
103 changes: 52 additions & 51 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,19 +126,9 @@ jobs:
- run:
<<: *run-style-check

python35:
docker:
- image: circleci/python:3.5.9-stretch
environment:
- TEST_TOX_ENV: "py35"
- COVERAGE_TOX_ENV: ""
- BUILD_TOX_ENV: "build-py35"
- TEST_WHEELINSTALL_ENV: "wheelinstall-py35"
<<: *ci-steps

python36:
docker:
- image: circleci/python:3.6.10-stretch
- image: circleci/python:3.6.12-stretch
environment:
- TEST_TOX_ENV: "py36"
- COVERAGE_TOX_ENV: ""
Expand All @@ -148,7 +138,7 @@ jobs:

python37:
docker:
- image: circleci/python:3.7.6-stretch
- image: circleci/python:3.7.9-stretch
environment:
- TEST_TOX_ENV: "py37"
- COVERAGE_TOX_ENV: ""
Expand All @@ -158,7 +148,7 @@ jobs:

python38:
docker:
- image: circleci/python:3.8.1-buster
- image: circleci/python:3.8.6-buster
environment:
- TEST_TOX_ENV: "py38"
- COVERAGE_TOX_ENV: "coverage"
Expand All @@ -167,29 +157,30 @@ jobs:
- UPLOAD_WHEELS: "true"
<<: *ci-steps

python35-min-req:
python39:
docker:
- image: circleci/python:3.5.9-stretch
- image: circleci/python:3.9.0-buster
environment:
- TEST_TOX_ENV: "py35-min-req"
- TEST_TOX_ENV: "py39"
- COVERAGE_TOX_ENV: ""
- BUILD_TOX_ENV: "build-py35-min-req"
- TEST_WHEELINSTALL_ENV: "wheelinstall-py35-min-req"
- BUILD_TOX_ENV: "build-py39"
- TEST_WHEELINSTALL_ENV: "wheelinstall-py39"
<<: *ci-steps

miniconda35:

python36-min-req:
docker:
- image: continuumio/miniconda3:4.3.27p0
- image: circleci/python:3.6.12-stretch
environment:
- CONDA_PYTHON_VER: "3.5"
- TEST_TOX_ENV: "py35"
- BUILD_TOX_ENV: "build-py35"
- TEST_WHEELINSTALL_ENV: "wheelinstall-py35"
<<: *conda-steps
- TEST_TOX_ENV: "py36-min-req"
- COVERAGE_TOX_ENV: ""
- BUILD_TOX_ENV: "build-py36-min-req"
- TEST_WHEELINSTALL_ENV: "wheelinstall-py36-min-req"
<<: *ci-steps

miniconda36:
docker:
- image: continuumio/miniconda3:4.7.12
- image: continuumio/miniconda3:4.8.2
environment:
- CONDA_PYTHON_VER: "3.6"
- TEST_TOX_ENV: "py36"
Expand All @@ -199,7 +190,7 @@ jobs:

miniconda37:
docker:
- image: continuumio/miniconda3:4.7.12
- image: continuumio/miniconda3:4.8.2
environment:
- CONDA_PYTHON_VER: "3.7"
- TEST_TOX_ENV: "py37"
Expand All @@ -209,20 +200,23 @@ jobs:

miniconda38:
docker:
- image: continuumio/miniconda3:4.7.12
- image: continuumio/miniconda3:4.8.2
environment:
- CONDA_PYTHON_VER: "3.8"
- TEST_TOX_ENV: "py38"
- BUILD_TOX_ENV: "build-py38"
- TEST_WHEELINSTALL_ENV: "wheelinstall-py38"
<<: *conda-steps

gallery35:
miniconda39:
docker:
- image: circleci/python:3.5.9-stretch
- image: continuumio/miniconda3:4.8.2
environment:
- TEST_TOX_ENV: "gallery-py35"
<<: *gallery-steps
- CONDA_PYTHON_VER: "3.9"
- TEST_TOX_ENV: "py39"
- BUILD_TOX_ENV: "build-py39"
- TEST_WHEELINSTALL_ENV: "wheelinstall-py39"
<<: *conda-steps

gallery36:
docker:
Expand All @@ -245,11 +239,18 @@ jobs:
- TEST_TOX_ENV: "gallery-py38"
<<: *gallery-steps

gallery35-min-req:
gallery39:
docker:
- image: circleci/python:3.9.0-buster
environment:
- TEST_TOX_ENV: "gallery-py39"
<<: *gallery-steps

gallery36-min-req:
docker:
- image: circleci/python:3.5.9-stretch
- image: circleci/python:3.6.10-stretch
environment:
- TEST_TOX_ENV: "gallery-py35-min-req"
- TEST_TOX_ENV: "gallery-py36-min-req"
<<: *gallery-steps

deploy-dev:
Expand Down Expand Up @@ -339,51 +340,51 @@ workflows:
jobs:
- flake8:
<<: *no_filters
- python35:
<<: *no_filters
- python36:
<<: *no_filters
- python37:
<<: *no_filters
- python38:
<<: *no_filters
- python35-min-req:
- python39:
<<: *no_filters
- miniconda35:
- python36-min-req:
<<: *no_filters
- miniconda36:
<<: *no_filters
- miniconda37:
<<: *no_filters
- miniconda38:
<<: *no_filters
- gallery35:
- miniconda39:
<<: *no_filters
- gallery36:
<<: *no_filters
- gallery37:
<<: *no_filters
- gallery38:
<<: *no_filters
- gallery35-min-req:
- gallery39:
<<: *no_filters
- gallery36-min-req:
<<: *no_filters
- deploy-dev:
requires:
- flake8
- python35
- python36
- python37
- python38
- python35-min-req
- miniconda35
- python39
- python36-min-req
- miniconda36
- miniconda37
- miniconda38
- gallery35
- miniconda39
- gallery36
- gallery37
- gallery38
- gallery35-min-req
- gallery39
- gallery36-min-req
filters:
tags:
ignore:
Expand All @@ -395,20 +396,20 @@ workflows:
- deploy-release:
requires:
- flake8
- python35
- python36
- python37
- python38
- python35-min-req
- miniconda35
- python39
- python36-min-req
- miniconda36
- miniconda37
- miniconda38
- gallery35
- miniconda39
- gallery36
- gallery37
- gallery38
- gallery35-min-req
- gallery39
- gallery36-min-req
filters:
tags:
only: /^[0-9]+(\.[0-9]+)*(\.post[0-9]+)?$/
Expand Down
48 changes: 24 additions & 24 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@ jobs:

strategy:
matrix:
macOS-py3.9:
imageName: 'macos-10.15'
pythonVersion: '3.9'
testToxEnv: 'py39'
coverageToxEnv: ''
buildToxEnv: 'build-py39'
testWheelInstallEnv: 'wheelinstall-py39'

macOS-py3.8:
imageName: 'macos-10.15'
pythonVersion: '3.8'
Expand All @@ -32,21 +40,21 @@ jobs:
buildToxEnv: 'build-py36'
testWheelInstallEnv: 'wheelinstall-py36'

macOS-py3.5:
macOS-py3.6-min-req:
imageName: 'macos-10.15'
pythonVersion: '3.5'
testToxEnv: 'py35'
pythonVersion: '3.6'
testToxEnv: 'py36-min-req'
coverageToxEnv: ''
buildToxEnv: 'build-py35'
testWheelInstallEnv: 'wheelinstall-py35'
buildToxEnv: 'build-py36-min-req'
testWheelInstallEnv: 'wheelinstall-py36-min-req'

macOS-py3.5-min-req:
imageName: 'macos-10.15'
pythonVersion: '3.5'
testToxEnv: 'py35-min-req'
Windows-py3.9:
imageName: 'vs2017-win2016'
pythonVersion: '3.9'
testToxEnv: 'py39'
coverageToxEnv: ''
buildToxEnv: 'build-py35-min-req'
testWheelInstallEnv: 'wheelinstall-py35-min-req'
buildToxEnv: 'build-py39'
testWheelInstallEnv: 'wheelinstall-py39'

Windows-py3.8:
imageName: 'vs2017-win2016'
Expand All @@ -72,21 +80,13 @@ jobs:
buildToxEnv: 'build-py36'
testWheelInstallEnv: 'wheelinstall-py36'

Windows-py3.5:
Windows-py3.6-min-req:
imageName: 'vs2017-win2016'
pythonVersion: '3.5'
testToxEnv: 'py35'
coverageToxEnv: ''
buildToxEnv: 'build-py35'
testWheelInstallEnv: 'wheelinstall-py35'

Windows-py3.5-min-req:
imageName: 'vs2017-win2016'
pythonVersion: '3.5'
testToxEnv: 'py35-min-req'
pythonVersion: '3.6'
testToxEnv: 'py36-min-req'
coverageToxEnv: ''
buildToxEnv: 'build-py35-min-req'
testWheelInstallEnv: 'wheelinstall-py35-min-req'
buildToxEnv: 'build-py36-min-req'
testWheelInstallEnv: 'wheelinstall-py36-min-req'

pool:
vmImage: $(imageName)
Expand Down

0 comments on commit 2c14a33

Please sign in to comment.