Skip to content

Commit 4c96d53

Browse files
authored
Python 3.8 CI (#3727)
* Run full fat Python 3.8 test suite * Move asv, Windows tests, and MacOSX tests to py38 * Move more stuff to Python 3.8 * Roll back windows to py37 * Update rtd and binder to 3.8 * Downgrade rtd to 3.7 * RTD to 3.8 again
1 parent 95e4f6c commit 4c96d53

File tree

9 files changed

+54
-24
lines changed

9 files changed

+54
-24
lines changed

.binder/environment.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: xarray-examples
22
channels:
33
- conda-forge
44
dependencies:
5-
- python=3.7
5+
- python=3.8
66
- boto3
77
- bottleneck
88
- cartopy

.pre-commit-config.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ repos:
1010
rev: stable
1111
hooks:
1212
- id: black
13-
language_version: python3.7
1413
- repo: https://github.com/pre-commit/pre-commit-hooks
1514
rev: v2.2.3
1615
hooks:

asv_bench/asv.conf.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
// The Pythons you'd like to test against. If not provided, defaults
4242
// to the current version of Python used to run `asv`.
43-
"pythons": ["3.6"],
43+
"pythons": ["3.8"],
4444

4545
// The matrix of dependencies to test. Each key is the name of a
4646
// package (in PyPI) and the values are version numbers. An empty

azure-pipelines.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ jobs:
2020
conda_env: py37
2121
py38:
2222
conda_env: py38
23-
py37-upstream-dev:
24-
conda_env: py37
23+
py38-upstream-dev:
24+
conda_env: py38
2525
upstream_dev: true
26-
py36-flaky:
27-
conda_env: py36
26+
py38-flaky:
27+
conda_env: py38
2828
pytest_extra_flags: --run-flaky --run-network-tests
2929
allow_failure: true
3030
pool:
@@ -35,8 +35,8 @@ jobs:
3535
- job: MacOSX
3636
strategy:
3737
matrix:
38-
py36:
39-
conda_env: py36
38+
py38:
39+
conda_env: py38
4040
pool:
4141
vmImage: 'macOS-10.13'
4242
steps:
@@ -74,7 +74,7 @@ jobs:
7474

7575
- job: TypeChecking
7676
variables:
77-
conda_env: py37
77+
conda_env: py38
7878
pool:
7979
vmImage: 'ubuntu-16.04'
8080
steps:
@@ -86,7 +86,7 @@ jobs:
8686
8787
- job: isort
8888
variables:
89-
conda_env: py37
89+
conda_env: py38
9090
pool:
9191
vmImage: 'ubuntu-16.04'
9292
steps:

ci/requirements/doc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ channels:
33
# Don't change to pkgs/main, as it causes random timeouts in readthedocs
44
- conda-forge
55
dependencies:
6-
- python=3.7
6+
- python=3.8
77
- bottleneck
88
- cartopy
99
- cfgrib

ci/requirements/py36.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dependencies:
2020
- hypothesis
2121
- iris
2222
- isort
23-
- lxml # optional dep of pydap
23+
- lxml # Optional dep of pydap
2424
- matplotlib
2525
- mypy=0.761 # Must match .pre-commit-config.yaml
2626
- nc-time-axis

ci/requirements/py37-windows.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dependencies:
2626
- nc-time-axis
2727
- netcdf4
2828
- numba
29-
- numpy<1.18 # FIXME https://github.com/pydata/xarray/issues/3409
29+
- numpy
3030
- pandas
3131
- pint
3232
- pip

ci/requirements/py38.yml

+40-9
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,45 @@ channels:
33
- conda-forge
44
dependencies:
55
- python=3.8
6-
- setuptools
6+
- black
7+
- boto3
8+
- bottleneck
9+
- cartopy
10+
- cdms2
11+
- cfgrib
12+
- cftime
13+
- coveralls
14+
- dask
15+
- distributed
16+
- flake8
17+
- h5netcdf
18+
- h5py
19+
- hdf5
20+
- hypothesis
21+
- iris
22+
- isort
23+
- lxml # Optional dep of pydap
24+
- matplotlib
25+
- mypy=0.761 # Must match .pre-commit-config.yaml
26+
- nc-time-axis
27+
- netcdf4
28+
- numba
29+
- numpy
30+
- pandas
31+
- pint
732
- pip
33+
- pseudonetcdf
34+
- pydap
35+
- pynio
36+
- pytest
37+
- pytest-cov
38+
- pytest-env
39+
- rasterio
40+
- scipy
41+
- seaborn
42+
- setuptools
43+
- sparse
44+
- toolz
45+
- zarr
846
- pip:
9-
- coveralls
10-
- dask
11-
- distributed
12-
- numpy
13-
- pandas
14-
- pytest
15-
- pytest-cov
16-
- pytest-env
47+
- numbagg

readthedocs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ conda:
77
environment: ci/requirements/doc.yml
88

99
python:
10-
version: 3.7
10+
version: 3.8
1111
install: []
1212

1313
formats: []

0 commit comments

Comments
 (0)