Skip to content

Commit

Permalink
Add CI test with pre-releases, update CircleCI images (#472)
Browse files Browse the repository at this point in the history
  • Loading branch information
rly committed Nov 24, 2020
1 parent fab5660 commit 3bfb7cd
Show file tree
Hide file tree
Showing 4 changed files with 72 additions and 10 deletions.
39 changes: 30 additions & 9 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ references:
jobs:
flake8:
docker:
- image: circleci/python:3.8.1-buster
- image: circleci/python:3.8.6-buster
steps:
- checkout
- run:
Expand Down Expand Up @@ -177,6 +177,16 @@ jobs:
- TEST_WHEELINSTALL_ENV: "wheelinstall"
<<: *ci-steps

python38-upgrade-dev-pre:
docker:
- image: circleci/python:3.8.6-buster
environment:
- TEST_TOX_ENV: "py38-upgrade-dev-pre"
- COVERAGE_TOX_ENV: ""
- BUILD_TOX_ENV: "build-py38-upgrade-dev-pre"
- TEST_WHEELINSTALL_ENV: "wheelinstall"
<<: *ci-steps

python36-min-req:
docker:
- image: circleci/python:3.6.12-stretch
Expand Down Expand Up @@ -229,21 +239,21 @@ jobs:

gallery36:
docker:
- image: circleci/python:3.6.10-stretch
- image: circleci/python:3.6.12-stretch
environment:
- TEST_TOX_ENV: "gallery-py36"
<<: *gallery-steps

gallery37:
docker:
- image: circleci/python:3.7.6-stretch
- image: circleci/python:3.7.9-stretch
environment:
- TEST_TOX_ENV: "gallery-py37"
<<: *gallery-steps

gallery38:
docker:
- image: circleci/python:3.8.1-buster
- image: circleci/python:3.8.6-buster
environment:
- TEST_TOX_ENV: "gallery-py38"
<<: *gallery-steps
Expand All @@ -257,21 +267,28 @@ jobs:

gallery38-upgrade-dev:
docker:
- image: circleci/python:3.8.1-buster
- image: circleci/python:3.8.6-buster
environment:
- TEST_TOX_ENV: "gallery-py38-upgrade-dev"
<<: *gallery-steps

gallery38-upgrade-dev-pre:
docker:
- image: circleci/python:3.8.6-buster
environment:
- TEST_TOX_ENV: "gallery-py38-upgrade-dev-pre"
<<: *gallery-steps

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

deploy-dev:
docker:
- image: circleci/python:3.8.1-buster
- image: circleci/python:3.8.6-buster
steps:
- checkout
- attach_workspace:
Expand All @@ -293,7 +310,7 @@ jobs:
deploy-release:
docker:
- image: circleci/python:3.8.1-buster
- image: circleci/python:3.8.6-buster
steps:
- attach_workspace:
at: ./
Expand All @@ -318,7 +335,7 @@ jobs:
pynwb-dev-python38:
docker:
- image: circleci/python:3.8.1-buster
- image: circleci/python:3.8.6-buster
steps:
- checkout
- run: git submodule sync
Expand Down Expand Up @@ -446,3 +463,7 @@ workflows:
<<: *no_filters
- gallery39:
<<: *no_filters
- python38-upgrade-dev-pre:
<<: *no_filters
- gallery38-upgrade-dev-pre:
<<: *no_filters
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
### Internal improvements
- Refactor `HDF5IO.write_dataset` to be more readable. @rly (#428)
- Fix bug in slicing tables with DynamicTableRegions. @ajtritt (#449)
- Add testing for Python 3.9. @ajtritt (#459)
- Add testing for Python 3.9 and using pre-release packages. @ajtritt, @rly (#459, #472)

### Bug fixes
- Fix development package dependency issues. @rly (#431)
Expand Down
16 changes: 16 additions & 0 deletions azure-pipelines-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,22 @@ jobs:
buildToxEnv: 'build-py39'
testWheelInstallEnv: 'wheelinstall'

macOS-py3.8-upgrade-dev-pre:
imageName: 'macos-10.15'
pythonVersion: '3.8'
testToxEnv: 'py38-upgrade-dev-pre'
coverageToxEnv: ''
buildToxEnv: 'build-py38-upgrade-dev-pre'
testWheelInstallEnv: 'wheelinstall'

Windows-py3.8-upgrade-dev-pre:
imageName: 'vs2017-win2016'
pythonVersion: '3.8'
testToxEnv: 'py38-upgrade-dev-pre'
coverageToxEnv: ''
buildToxEnv: 'build-py38-upgrade-dev-pre'
testWheelInstallEnv: 'wheelinstall'

pool:
vmImage: $(imageName)

Expand Down
25 changes: 25 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@ deps =
-rrequirements-dev.txt
commands = {[testenv]commands}

# Test with python 3.8, pinned dev reqs, and pre-release run requirements
[testenv:py38-upgrade-dev-pre]
basepython = python3.8
install_command =
pip install -U --pre -e . {opts} {packages}
deps =
-rrequirements-dev.txt
commands = {[testenv]commands}

# Test with python 3.6, pinned dev reqs, and minimum run requirements
[testenv:py36-min-req]
basepython = python3.6
Expand Down Expand Up @@ -74,6 +83,14 @@ deps =
-rrequirements-dev.txt
commands = {[testenv:build]commands}

[testenv:build-py38-upgrade-dev-pre]
basepython = python3.8
install_command =
pip install -U --pre -e . {opts} {packages}
deps =
-rrequirements-dev.txt
commands = {[testenv:build]commands}

[testenv:build-py36-min-req]
basepython = python3.6
deps =
Expand Down Expand Up @@ -136,6 +153,14 @@ deps =
-rrequirements-dev.txt
commands = {[testenv:gallery]commands}

[testenv:gallery-py38-upgrade-dev-pre]
basepython = python3.8
install_command =
pip install -U --pre -e . {opts} {packages}
deps =
-rrequirements-dev.txt
commands = {[testenv:gallery]commands}

[testenv:gallery-py36-min-req]
basepython = python3.6
deps =
Expand Down

0 comments on commit 3bfb7cd

Please sign in to comment.