Skip to content

Commit 792ebd1

Browse files
authored
Revert "Drop support for Python 3.6. (#150)" (#154)
This reverts commit 7b7df8f.
1 parent 7b7df8f commit 792ebd1

File tree

7 files changed

+386
-167
lines changed

7 files changed

+386
-167
lines changed

.cirrus.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ test_task:
8888
only_if: ${SKIP_TEST_TASK} == ""
8989
auto_cancellation: true
9090
matrix:
91+
env:
92+
PY_VER: "3.6"
9193
env:
9294
PY_VER: "3.7"
9395
env:

noxfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
PACKAGE = "esmf_regrid"
2323

2424
#: Cirrus-CI environment variable hook.
25-
PY_VER = os.environ.get("PY_VER", ["3.7", "3.8"])
25+
PY_VER = os.environ.get("PY_VER", ["3.6", "3.7", "3.8"])
2626

2727
#: Cirrus-CI environment variable hook.
2828
COVERAGE = os.environ.get("COVERAGE", False)

requirements/nox.lock/py36-linux-64.lock

Lines changed: 168 additions & 0 deletions
Large diffs are not rendered by default.

requirements/nox.lock/py37-linux-64.lock

Lines changed: 90 additions & 81 deletions
Large diffs are not rendered by default.

requirements/nox.lock/py38-linux-64.lock

Lines changed: 93 additions & 84 deletions
Large diffs are not rendered by default.

requirements/py36.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: esmf-regrid-dev
2+
3+
channels:
4+
- conda-forge
5+
6+
dependencies:
7+
- python=3.6
8+
9+
# Setup dependencies.
10+
- setuptools>=40.8.0
11+
12+
# Core dependencies.
13+
- cartopy>=0.18
14+
- numpy>=1.14
15+
- scipy
16+
- esmpy>=7.0
17+
- iris
18+
- cf-units
19+
20+
# Test dependencies.
21+
- asv
22+
- black=20.8b1
23+
- codecov
24+
- flake8
25+
- flake8-docstrings
26+
- flake8-import-order
27+
- nox
28+
- pre-commit
29+
- pytest
30+
- pytest-cov

setup.cfg

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ classifiers =
88
Natural Language :: English
99
Operating System :: OS Independent
1010
Programming Language :: Python :: 3
11+
Programming Language :: Python :: 3.6
1112
Programming Language :: Python :: 3.7
1213
Programming Language :: Python :: 3.8
1314
Topic :: Scientific/Engineering :: Atmospheric Science
@@ -29,7 +30,7 @@ version = attr: esmf_regrid.__version__
2930
[options]
3031
packages = find:
3132
python_requires =
32-
>=3.7,<3.9
33+
>=3.6,<3.9
3334
setup_requires =
3435
setuptools>=40.8.0
3536
zip_safe = False

0 commit comments

Comments
 (0)