Skip to content

Commit cb3138c

Browse files
author
Joseph Hamman
committed
initial batch of changes to drop py2 (no code changes)
1 parent 5385484 commit cb3138c

File tree

6 files changed

+6
-35
lines changed

6 files changed

+6
-35
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ services:
2424

2525
matrix:
2626
include:
27-
- python: 2.7
2827
- python: 3.5
2928
- python: 3.6
3029
- python: 3.7

appveyor.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ environment:
1818

1919
matrix:
2020

21-
- PYTHON: "C:\\Python27-x64"
22-
PYTHON_VERSION: "2.7"
23-
DISTUTILS_USE_SDK: "1"
24-
2521
- PYTHON: "C:\\Python35-x64"
2622
PYTHON_VERSION: "3.5"
2723

build.cmd

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@ SET COMMAND_TO_RUN=%*
2323
SET WIN_SDK_ROOT=C:\Program Files\Microsoft SDKs\Windows
2424

2525
SET MAJOR_PYTHON_VERSION="%PYTHON_VERSION:~0,1%"
26-
IF %MAJOR_PYTHON_VERSION% == "2" (
27-
SET WINDOWS_SDK_VERSION="v7.0"
28-
) ELSE IF %MAJOR_PYTHON_VERSION% == "3" (
26+
IF %MAJOR_PYTHON_VERSION% == "3" (
2927
SET WINDOWS_SDK_VERSION="v7.1"
3028
) ELSE (
3129
ECHO Unsupported Python version: "%MAJOR_PYTHON_VERSION%"

docs/conf.py

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,6 @@
1616

1717
import sys
1818
import os
19-
from mock import Mock as MagicMock
20-
21-
22-
PY2 = sys.version_info[0] == 2
23-
24-
25-
class Mock(MagicMock):
26-
@classmethod
27-
def __getattr__(cls, name):
28-
return Mock()
29-
30-
31-
MOCK_MODULES = []
32-
if PY2:
33-
MOCK_MODULES.append('lzma')
34-
35-
36-
sys.modules.update((mod_name, Mock()) for mod_name in MOCK_MODULES)
37-
3819

3920
# If extensions (or modules to document with autodoc) are in another directory,
4021
# add these directories to sys.path here. If the directory is relative to the

setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
'setuptools>18.0',
3636
'setuptools-scm>1.5.4'
3737
],
38+
python_requires='>=3.5',
3839
install_requires=dependencies,
3940
package_dir={'': '.'},
4041
packages=['zarr', 'zarr.tests'],
@@ -47,8 +48,6 @@
4748
'Programming Language :: Python',
4849
'Topic :: Software Development :: Libraries :: Python Modules',
4950
'Operating System :: Unix',
50-
'Programming Language :: Python :: 2',
51-
'Programming Language :: Python :: 2.7',
5251
'Programming Language :: Python :: 3',
5352
'Programming Language :: Python :: 3.5',
5453
'Programming Language :: Python :: 3.6',

tox.ini

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

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

99
[testenv]
1010
install_command = pip install --no-binary=numcodecs {opts} {packages}
1111
setenv =
1212
PYTHONHASHSEED = 42
1313
# hooks for coverage exclusions based on Python major version
1414
py35,py36,py37: PY_MAJOR_VERSION = py3
15-
py27: PY_MAJOR_VERSION = py2
1615
passenv =
1716
ZARR_TEST_ABS
1817
ZARR_TEST_MONGO
@@ -21,24 +20,23 @@ commands =
2120
# clear out any data files generated during tests
2221
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*")]'
2322
# main unit test runner
24-
py27,py35,py36: pytest -v --cov=zarr --cov-config=.coveragerc zarr
23+
py35,py36: pytest -v --cov=zarr --cov-config=.coveragerc zarr
2524
# don't collect coverage when running older numpy versions
2625
py37-{npy115,npy116}: pytest -v zarr
2726
# collect coverage and run doctests under py37
2827
py37-npylatest: pytest -v --cov=zarr --cov-config=.coveragerc --doctest-plus zarr --remote-data
2928
# generate a coverage report
30-
py27,py35,py36,py37-npylatest: coverage report -m
29+
py35,py36,py37-npylatest: coverage report -m
3130
# run doctests in the tutorial and spec
3231
py37-npylatest: python -m doctest -o NORMALIZE_WHITESPACE -o ELLIPSIS docs/tutorial.rst docs/spec/v2.rst
3332
# pep8 checks
3433
py37-npylatest: flake8 zarr
3534
# print environment for debugging
3635
pip freeze
3736
deps =
38-
py27: backports.lzma
3937
py37-npy115: numpy==1.15.4
4038
py37-npy116: numpy==1.16.4
41-
py27,py35,py36,py37-npylatest: -rrequirements_dev_numpy.txt
39+
py35,py36,py37-npylatest: -rrequirements_dev_numpy.txt
4240
-rrequirements_dev_minimal.txt
4341
-rrequirements_dev_optional.txt
4442

0 commit comments

Comments
 (0)