Skip to content

Commit f6338b7

Browse files
authored
Drop 3.6 builds (#774)
* Replace 3.6 builds with 3.9 * Rollback py39 attempt * Install types-redis along with redis * Remove unused .travis.yml * Remove other references to 3.6 * Drop the python_version filters
1 parent 11269a5 commit f6338b7

9 files changed

+20
-64
lines changed

.github/workflows/python-package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
strategy:
1717
matrix:
18-
python-version: ['3.6.9' , 3.7, 3.8]
18+
python-version: [3.7, 3.8]
1919
numpy_version: ['==1.16.4', '']
2020
services:
2121
redis:

.travis.yml

Lines changed: 0 additions & 49 deletions
This file was deleted.

docs/release.rst

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
Release notes
22
=============
33

4+
Unreleased
5+
----------
6+
7+
This release of Zarr Python is the first release of Zarr to not support Python 3.6.
8+
49
.. _release_2.8.3:
510

611
2.8.3
@@ -129,7 +134,7 @@ Bug fixes
129134
2.6.0
130135
-----
131136

132-
This release of Zarr Python is is the first release of Zarr to not support Python 3.5.
137+
This release of Zarr Python is the first release of Zarr to not support Python 3.5.
133138

134139
* End Python 3.5 support.
135140
By :user:`Chris Barnes <clbarnes>`; :issue:`602`.

mypy.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[mypy]
2-
python_version = 3.6
2+
python_version = 3.7
33
ignore_missing_imports = True
44
follow_imports = silent

requirements_dev_minimal.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ numcodecs==0.7.3
55
msgpack-python==0.5.6
66
setuptools-scm==6.0.1
77
# test requirements
8-
pytest==5.2.0; python_version > '3.0'
8+
pytest==5.2.0

requirements_dev_numpy.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Break this out into a separate file to allow testing against
22
# different versions of numpy. This file should pin to the latest
33
# numpy version.
4-
numpy==1.20.3; python_version >= '3.6'
4+
numpy==1.20.3

requirements_dev_optional.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ ipytree==0.2.1
88
# version to get compatibility with azure storage emulator on appveyor (FIXME)
99
azure-storage-blob==12.5.0 # pyup: ignore
1010
redis==3.5.3
11+
types-redis
1112
pymongo==3.11.4
1213
# optional test requirements
1314
tox==3.23.1
@@ -16,6 +17,6 @@ flake8==3.9.2
1617
pytest-cov==2.12.0
1718
pytest-doctestplus==0.4.0
1819
h5py==2.10.0
19-
s3fs==2021.5.0; python_version > '3.6'
20-
fsspec==2021.5.0; python_version > '3.6'
21-
moto[server]>=1.3.14; python_version > '3.6'
20+
s3fs==2021.5.0
21+
fsspec==2021.5.0
22+
moto[server]>=1.3.14

setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
'ipytree',
3434
],
3535
},
36-
python_requires='>=3.6, <4',
36+
python_requires='>=3.7, <4',
3737
install_requires=dependencies,
3838
package_dir={'': '.'},
3939
packages=['zarr', 'zarr.tests'],
@@ -47,7 +47,6 @@
4747
'Topic :: Software Development :: Libraries :: Python Modules',
4848
'Operating System :: Unix',
4949
'Programming Language :: Python :: 3',
50-
'Programming Language :: Python :: 3.6',
5150
'Programming Language :: Python :: 3.7',
5251
'Programming Language :: Python :: 3.8',
5352
'Programming Language :: Python :: 3.9',

tox.ini

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# and then run "tox" from this directory.
55

66
[tox]
7-
envlist = py36, py37-npy{115,116,latest}, py38, docs
7+
envlist = py37-npy{115,116,latest}, py38, docs
88

99
[testenv]
1010
install_command = pip install --no-binary=numcodecs {opts} {packages}
@@ -18,13 +18,13 @@ commands =
1818
# clear out any data files generated during tests
1919
python -c 'import glob; import shutil; import os; [(shutil.rmtree(d) if os.path.isdir(d) else os.remove(d) if os.path.isfile(d) else None) for d in glob.glob("./example*")]'
2020
# main unit test runner
21-
py36,py38: pytest -v --cov=zarr --cov-config=.coveragerc zarr
21+
py38: pytest -v --cov=zarr --cov-config=.coveragerc zarr
2222
# don't collect coverage when running older numpy versions
2323
py37-{npy115,npy116}: pytest -v zarr
2424
# collect coverage and run doctests under py37
2525
py37-npylatest: pytest -v --cov=zarr --cov-config=.coveragerc --doctest-plus zarr --remote-data
2626
# generate a coverage report
27-
py36,py37-npylatest,py38: coverage report -m
27+
py37-npylatest,py38: coverage report -m
2828
# run doctests in the tutorial and spec
2929
py38: python -m doctest -o NORMALIZE_WHITESPACE -o ELLIPSIS docs/tutorial.rst docs/spec/v2.rst
3030
# pep8 checks
@@ -34,12 +34,12 @@ commands =
3434
deps =
3535
py37-npy115: numpy==1.15.4
3636
py37-npy116: numpy==1.16.4
37-
py36,py37-npylatest,py38: -rrequirements_dev_numpy.txt
37+
py37-npylatest,py38: -rrequirements_dev_numpy.txt
3838
-rrequirements_dev_minimal.txt
3939
-rrequirements_dev_optional.txt
4040

4141
[testenv:docs]
42-
basepython = python3.6
42+
basepython = python3.7
4343
changedir = docs
4444
deps =
4545
-rrequirements_rtfd.txt

0 commit comments

Comments
 (0)