Skip to content

Commit

Permalink
Run minimum requirements CI on Python 3.6 instead of 3.5 (#1194)
Browse files Browse the repository at this point in the history
  • Loading branch information
rly authored Feb 21, 2020
1 parent b63d463 commit 8cb3d9f
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 24 deletions.
16 changes: 8 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -163,14 +163,14 @@ jobs:
- TEST_WHEELINSTALL_ENV: "wheelinstall-py37"
<<: *ci-steps

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

miniconda35:
Expand Down Expand Up @@ -302,7 +302,7 @@ workflows:
<<: *no_filters
- python37:
<<: *no_filters
- python35-min-req:
- python36-min-req:
<<: *no_filters
- miniconda35:
<<: *no_filters
Expand All @@ -322,7 +322,7 @@ workflows:
- python35
- python36
- python37
- python35-min-req
- python36-min-req
- miniconda35
- miniconda36
- miniconda37
Expand All @@ -343,7 +343,7 @@ workflows:
- python35
- python36
- python37
- python35-min-req
- python36-min-req
- miniconda35
- miniconda36
- miniconda37
Expand Down
20 changes: 10 additions & 10 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ jobs:
buildToxEnv: 'build-py35'
testWheelInstallEnv: 'wheelinstall-py35'

macOS-py3.5-min-req:
macOS-py3.6-min-req:
imageName: 'macos-10.13'
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'

Windows-py3.7:
imageName: 'vs2017-win2016'
Expand All @@ -61,13 +61,13 @@ jobs:
buildToxEnv: 'build-py35'
testWheelInstallEnv: 'wheelinstall-py35'

Windows-py3.5-min-req:
Windows-py3.6-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
12 changes: 6 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ commands =
coverage run test.py --pynwb
coverage html -d tests/coverage/htmlcov

# Test with python 3.5, pinned dev reqs, and minimum run requirements
[testenv:py35-min-req]
basepython = python3.5
# Test with python 3.6, pinned dev reqs, and minimum run requirements
[testenv:py36-min-req]
basepython = python3.6
deps =
-rrequirements-dev.txt
-rrequirements-min.txt
Expand All @@ -53,8 +53,8 @@ commands = {[testenv:build]commands}
basepython = python3.7
commands = {[testenv:build]commands}

[testenv:build-py35-min-req]
basepython = python3.5
[testenv:build-py36-min-req]
basepython = python3.6
deps =
-rrequirements-dev.txt
-rrequirements-min.txt
Expand Down Expand Up @@ -82,7 +82,7 @@ commands = python -c "import pynwb"
deps = null
commands = python -c "import pynwb"

[testenv:wheelinstall-py35-min-req]
[testenv:wheelinstall-py36-min-req]
deps = null
commands = python -c "import pynwb"

Expand Down

0 comments on commit 8cb3d9f

Please sign in to comment.