Skip to content

Commit

Permalink
Drop python 3.6 support, add python 3.9 support (#620)
Browse files Browse the repository at this point in the history
  • Loading branch information
rly authored May 26, 2021
1 parent b55bd7c commit 655b3d1
Show file tree
Hide file tree
Showing 11 changed files with 82 additions and 254 deletions.
140 changes: 34 additions & 106 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,6 @@ references:
username: hdmf
password: $DOCKERHUB_PASSWORD

py36: &py36
docker:
- image: circleci/python:3.6.13-buster
auth:
username: hdmf
password: $DOCKERHUB_PASSWORD

conda-image: &conda-image
docker:
- image: continuumio/miniconda3:4.9.2
Expand Down Expand Up @@ -163,14 +156,6 @@ jobs:
- run:
<<: *run-style-check

python36:
<<: *py36
environment:
- TEST_TOX_ENV: "py36"
- BUILD_TOX_ENV: "build-py36"
- TEST_WHEELINSTALL_ENV: "wheelinstall"
<<: *ci-steps

python37:
<<: *py37
environment:
Expand All @@ -196,22 +181,6 @@ jobs:
- TEST_WHEELINSTALL_ENV: "wheelinstall"
<<: *ci-steps

python38-upgrade-dev:
<<: *py38
environment:
- TEST_TOX_ENV: "py38-upgrade-dev"
- BUILD_TOX_ENV: "build-py38-upgrade-dev"
- TEST_WHEELINSTALL_ENV: "wheelinstall"
<<: *ci-steps

python38-upgrade-dev-pre:
<<: *py38
environment:
- TEST_TOX_ENV: "py38-upgrade-dev-pre"
- BUILD_TOX_ENV: "build-py38-upgrade-dev-pre"
- TEST_WHEELINSTALL_ENV: "wheelinstall"
<<: *ci-steps

python39-upgrade-dev:
<<: *py39
environment:
Expand All @@ -228,23 +197,14 @@ jobs:
- TEST_WHEELINSTALL_ENV: "wheelinstall"
<<: *ci-steps

python36-min-req:
<<: *py36
python37-min-req:
<<: *py37
environment:
- TEST_TOX_ENV: "py36-min-req"
- BUILD_TOX_ENV: "build-py36-min-req"
- TEST_TOX_ENV: "py37-min-req"
- BUILD_TOX_ENV: "build-py37-min-req"
- TEST_WHEELINSTALL_ENV: "wheelinstall"
<<: *ci-steps

miniconda36:
<<: *conda-image
environment:
- CONDA_PYTHON_VER: "3.6.*=*_cpython" # avoid using pypy compiler
- TEST_TOX_ENV: "py36"
- BUILD_TOX_ENV: "build-py36"
- TEST_WHEELINSTALL_ENV: "wheelinstall"
<<: *conda-steps

miniconda37:
<<: *conda-image
environment:
Expand Down Expand Up @@ -272,12 +232,6 @@ jobs:
- TEST_WHEELINSTALL_ENV: "wheelinstall"
<<: *conda-steps

gallery36:
<<: *py36
environment:
- TEST_TOX_ENV: "gallery-py36"
<<: *gallery-steps

gallery37:
<<: *py37
environment:
Expand All @@ -296,18 +250,6 @@ jobs:
- TEST_TOX_ENV: "gallery-py39"
<<: *gallery-steps

gallery38-upgrade-dev:
<<: *py38
environment:
- TEST_TOX_ENV: "gallery-py38-upgrade-dev"
<<: *gallery-steps

gallery38-upgrade-dev-pre:
<<: *py38
environment:
- TEST_TOX_ENV: "gallery-py38-upgrade-dev-pre"
<<: *gallery-steps

gallery39-upgrade-dev:
<<: *py39
environment:
Expand All @@ -320,14 +262,14 @@ jobs:
- TEST_TOX_ENV: "gallery-py39-upgrade-dev-pre"
<<: *gallery-steps

gallery36-min-req:
<<: *py36
gallery37-min-req:
<<: *py37
environment:
- TEST_TOX_ENV: "gallery-py36-min-req"
- TEST_TOX_ENV: "gallery-py37-min-req"
<<: *gallery-steps

deploy-dev:
<<: *py38
<<: *py39
steps:
- checkout
- attach_workspace:
Expand All @@ -347,7 +289,7 @@ jobs:
--re-upload
deploy-release:
<<: *py38
<<: *py39
steps:
- attach_workspace:
at: ./
Expand All @@ -371,8 +313,8 @@ jobs:
create $CIRCLE_TAG --name $CIRCLE_TAG \
--publish ./dist/*
pynwb-dev-python38:
<<: *py38
pynwb-dev-python39:
<<: *py39
steps:
- checkout
- run: git submodule sync
Expand Down Expand Up @@ -410,27 +352,27 @@ workflows:
jobs:
- flake8:
<<: *no_filters
- python36-min-req:
- python37-min-req:
<<: *no_filters
- python38:
- python39:
<<: *no_filters
- miniconda36:
- miniconda37:
<<: *no_filters
- miniconda38:
- miniconda39:
<<: *no_filters
- gallery36-min-req:
- gallery37-min-req:
<<: *no_filters
- gallery38:
- gallery39:
<<: *no_filters
- deploy-dev:
requires:
- flake8
- python38
- python36-min-req
- miniconda36
- miniconda38
- gallery38
- gallery36-min-req
- python37-min-req
- python39
- miniconda37
- miniconda39
- gallery37-min-req
- gallery39
filters:
tags:
ignore:
Expand All @@ -444,20 +386,20 @@ workflows:
- deploy-release:
requires:
- flake8
- python38
- python36-min-req
- miniconda36
- miniconda38
- gallery38
- gallery36-min-req
- python37-min-req
- python39
- miniconda37
- miniconda39
- gallery37-min-req
- gallery39
filters:
tags:
only: /^[0-9]+(\.[0-9]+)*(\.post[0-9]+)?$/
branches:
ignore: /.*/
context:
- docker-hub-creds
- pynwb-dev-python38:
- pynwb-dev-python39:
filters:
branches:
ignore: dev
Expand All @@ -474,43 +416,29 @@ workflows:
jobs:
- flake8:
<<: *no_filters
- python36:
<<: *no_filters
- python36-min-req:
<<: *no_filters
- python37:
<<: *no_filters
- python38:
<<: *no_filters
- python38-upgrade-dev:
- python37-min-req:
<<: *no_filters
- python38-upgrade-dev-pre:
- python38:
<<: *no_filters
- python39:
<<: *no_filters
- python39-upgrade-dev:
<<: *no_filters
- python39-upgrade-dev-pre:
<<: *no_filters
- miniconda36:
<<: *no_filters
- miniconda37:
<<: *no_filters
- miniconda38:
<<: *no_filters
- miniconda39:
<<: *no_filters
- gallery36:
<<: *no_filters
- gallery36-min-req:
<<: *no_filters
- gallery37:
<<: *no_filters
- gallery38:
<<: *no_filters
- gallery38-upgrade-dev:
- gallery37-min-req:
<<: *no_filters
- gallery38-upgrade-dev-pre:
- gallery38:
<<: *no_filters
- gallery39:
<<: *no_filters
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ assignees: ''
<!--Please describe your environment according to the following bullet points.-->

Python Executable: Conda or Python
Python Version: Python 3.6, 3.7, or 3.8
Python Version: Python 3.7, 3.8, or 3.9
Operating System: Windows, macOS or Linux
HDMF Version:

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
os: [ubuntu-latest, macos-latest, windows-latest]
env:
OS: ${{ matrix.os }}
PYTHON: '3.8'
PYTHON: '3.9'
steps:
- name: Cancel Workflow Action
uses: styfle/cancel-workflow-action@0.6.0
Expand All @@ -27,7 +27,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.8
python-version: 3.9
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# HDMF Changelog

## HDMF 3.0.0 (Upcoming)

### Major features
- Add support for Python 3.9, drop support for Python 3.6. @rly (#620)

## HDMF 2.5.6 (May 19, 2021)

### Bug fix
Expand Down
58 changes: 8 additions & 50 deletions azure-pipelines-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,6 @@ jobs:
buildToxEnv: 'build-py39'
testWheelInstallEnv: 'wheelinstall'

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

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

macOS-py3.8:
imageName: 'macos-10.15'
pythonVersion: '3.8'
Expand All @@ -64,18 +50,11 @@ jobs:
buildToxEnv: 'build-py37'
testWheelInstallEnv: 'wheelinstall'

macOS-py3.6:
imageName: 'macos-10.15'
pythonVersion: '3.6'
testToxEnv: 'py36'
buildToxEnv: 'build-py36'
testWheelInstallEnv: 'wheelinstall'

macOS-py3.6-min-req:
macOS-py3.7-min-req:
imageName: 'macos-10.15'
pythonVersion: '3.6'
testToxEnv: 'py36-min-req'
buildToxEnv: 'build-py36-min-req'
pythonVersion: '3.7'
testToxEnv: 'py37-min-req'
buildToxEnv: 'build-py37-min-req'
testWheelInstallEnv: 'wheelinstall'

Windows-py3.9:
Expand All @@ -99,20 +78,6 @@ jobs:
buildToxEnv: 'build-py39-upgrade-dev'
testWheelInstallEnv: 'wheelinstall'

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

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

Windows-py3.8:
imageName: 'vs2017-win2016'
pythonVersion: '3.8'
Expand All @@ -127,18 +92,11 @@ jobs:
buildToxEnv: 'build-py37'
testWheelInstallEnv: 'wheelinstall'

Windows-py3.6:
imageName: 'vs2017-win2016'
pythonVersion: '3.6'
testToxEnv: 'py36'
buildToxEnv: 'build-py36'
testWheelInstallEnv: 'wheelinstall'

Windows-py3.6-min-req:
Windows-py3.7-min-req:
imageName: 'vs2017-win2016'
pythonVersion: '3.6'
testToxEnv: 'py36-min-req'
buildToxEnv: 'build-py36-min-req'
pythonVersion: '3.7'
testToxEnv: 'py37-min-req'
buildToxEnv: 'build-py37-min-req'
testWheelInstallEnv: 'wheelinstall'

pool:
Expand Down
Loading

0 comments on commit 655b3d1

Please sign in to comment.