From a673bdf0148caa909c30e24ed8138143596fe655 Mon Sep 17 00:00:00 2001 From: Guido Imperiale Date: Wed, 29 Jan 2020 17:49:16 +0000 Subject: [PATCH 1/7] Run full fat Python 3.8 test suite --- ci/requirements/py38.yml | 47 +++++++++++++++++++++++++++++++++------- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/ci/requirements/py38.yml b/ci/requirements/py38.yml index 9698e3efecf..01beb791ead 100644 --- a/ci/requirements/py38.yml +++ b/ci/requirements/py38.yml @@ -3,13 +3,44 @@ channels: - conda-forge dependencies: - python=3.8 + - black + - boto3 + - bottleneck + - cartopy + - cdms2 + - cfgrib + - cftime + - coveralls + - dask + - distributed + - flake8 + - h5netcdf + - h5py + - hdf5 + - hypothesis + - iris + - isort + - lxml # Optional dep of pydap + - matplotlib + - mypy=0.761 # Must match .pre-commit-config.yaml + - nc-time-axis + - netcdf4 + - numba + - numpy + - pandas + - pint - pip + - pseudonetcdf + - pydap + - pynio + - pytest + - pytest-cov + - pytest-env + - rasterio + - scipy + - seaborn + - sparse + - toolz + - zarr - pip: - - coveralls - - dask - - distributed - - numpy - - pandas - - pytest - - pytest-cov - - pytest-env + - numbagg From fbd60e6fb9e10967ad7c5a3987bc2ec8d6d657aa Mon Sep 17 00:00:00 2001 From: Guido Imperiale Date: Wed, 29 Jan 2020 17:49:43 +0000 Subject: [PATCH 2/7] Move asv, Windows tests, and MacOSX tests to py38 --- asv_bench/asv.conf.json | 2 +- azure-pipelines.yml | 8 ++++---- ci/requirements/py36.yml | 2 +- ci/requirements/{py37-windows.yml => py38-windows.yml} | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) rename ci/requirements/{py37-windows.yml => py38-windows.yml} (89%) diff --git a/asv_bench/asv.conf.json b/asv_bench/asv.conf.json index 11a779ae376..d35a2a223a2 100644 --- a/asv_bench/asv.conf.json +++ b/asv_bench/asv.conf.json @@ -40,7 +40,7 @@ // The Pythons you'd like to test against. If not provided, defaults // to the current version of Python used to run `asv`. - "pythons": ["3.6"], + "pythons": ["3.8"], // The matrix of dependencies to test. Each key is the name of a // package (in PyPI) and the values are version numbers. An empty diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b09c4ec127c..a138e06ecfc 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -35,8 +35,8 @@ jobs: - job: MacOSX strategy: matrix: - py36: - conda_env: py36 + py38: + conda_env: py38 pool: vmImage: 'macOS-10.13' steps: @@ -45,8 +45,8 @@ jobs: - job: Windows strategy: matrix: - py37: - conda_env: py37-windows + py38: + conda_env: py38-windows pool: vmImage: 'vs2017-win2016' steps: diff --git a/ci/requirements/py36.yml b/ci/requirements/py36.yml index 929a36295a0..afb6dd5ede8 100644 --- a/ci/requirements/py36.yml +++ b/ci/requirements/py36.yml @@ -20,7 +20,7 @@ dependencies: - hypothesis - iris - isort - - lxml # optional dep of pydap + - lxml # Optional dep of pydap - matplotlib - mypy=0.761 # Must match .pre-commit-config.yaml - nc-time-axis diff --git a/ci/requirements/py37-windows.yml b/ci/requirements/py38-windows.yml similarity index 89% rename from ci/requirements/py37-windows.yml rename to ci/requirements/py38-windows.yml index 8755ea2cef6..b7b24e5c9ee 100644 --- a/ci/requirements/py37-windows.yml +++ b/ci/requirements/py38-windows.yml @@ -2,7 +2,7 @@ name: xarray-tests channels: - conda-forge dependencies: - - python=3.7 + - python=3.8 - black - boto3 - bottleneck @@ -26,7 +26,7 @@ dependencies: - nc-time-axis - netcdf4 - numba - - numpy<1.18 # FIXME https://github.com/pydata/xarray/issues/3409 + - numpy - pandas - pint - pip From 5b2700986e4f94d2b3266bb44acfcfe65c18efaf Mon Sep 17 00:00:00 2001 From: Guido Imperiale Date: Wed, 29 Jan 2020 17:58:37 +0000 Subject: [PATCH 3/7] Move more stuff to Python 3.8 --- .pre-commit-config.yaml | 1 - azure-pipelines.yml | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 57a987faa20..9df95648774 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -10,7 +10,6 @@ repos: rev: stable hooks: - id: black - language_version: python3.7 - repo: https://github.com/pre-commit/pre-commit-hooks rev: v2.2.3 hooks: diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a138e06ecfc..62d6a29b782 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -20,11 +20,11 @@ jobs: conda_env: py37 py38: conda_env: py38 - py37-upstream-dev: - conda_env: py37 + py38-upstream-dev: + conda_env: py38 upstream_dev: true - py36-flaky: - conda_env: py36 + py38-flaky: + conda_env: py38 pytest_extra_flags: --run-flaky --run-network-tests allow_failure: true pool: @@ -74,7 +74,7 @@ jobs: - job: TypeChecking variables: - conda_env: py37 + conda_env: py38 pool: vmImage: 'ubuntu-16.04' steps: @@ -86,7 +86,7 @@ jobs: - job: isort variables: - conda_env: py37 + conda_env: py38 pool: vmImage: 'ubuntu-16.04' steps: From c74b62e1c4d0f7ecf029b92458c3bf9ab6d51cc0 Mon Sep 17 00:00:00 2001 From: Guido Imperiale Date: Wed, 29 Jan 2020 23:22:20 +0000 Subject: [PATCH 4/7] Roll back windows to py37 --- azure-pipelines.yml | 4 ++-- ci/requirements/{py38-windows.yml => py37-windows.yml} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename ci/requirements/{py38-windows.yml => py37-windows.yml} (97%) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 62d6a29b782..5789161c966 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -45,8 +45,8 @@ jobs: - job: Windows strategy: matrix: - py38: - conda_env: py38-windows + py37: + conda_env: py37-windows pool: vmImage: 'vs2017-win2016' steps: diff --git a/ci/requirements/py38-windows.yml b/ci/requirements/py37-windows.yml similarity index 97% rename from ci/requirements/py38-windows.yml rename to ci/requirements/py37-windows.yml index b7b24e5c9ee..7429d093a6f 100644 --- a/ci/requirements/py38-windows.yml +++ b/ci/requirements/py37-windows.yml @@ -2,7 +2,7 @@ name: xarray-tests channels: - conda-forge dependencies: - - python=3.8 + - python=3.7 - black - boto3 - bottleneck From 205ad2083f60df1bd0d7d8814fba083d5ca68043 Mon Sep 17 00:00:00 2001 From: Guido Imperiale Date: Thu, 30 Jan 2020 12:24:34 +0000 Subject: [PATCH 5/7] Update rtd and binder to 3.8 --- .binder/environment.yml | 2 +- ci/requirements/doc.yml | 2 +- readthedocs.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.binder/environment.yml b/.binder/environment.yml index 13b6b99e6fc..3b9a0e31bba 100644 --- a/.binder/environment.yml +++ b/.binder/environment.yml @@ -2,7 +2,7 @@ name: xarray-examples channels: - conda-forge dependencies: - - python=3.7 + - python=3.8 - boto3 - bottleneck - cartopy diff --git a/ci/requirements/doc.yml b/ci/requirements/doc.yml index a8b72dc0956..b2e3ed7da52 100644 --- a/ci/requirements/doc.yml +++ b/ci/requirements/doc.yml @@ -3,7 +3,7 @@ channels: # Don't change to pkgs/main, as it causes random timeouts in readthedocs - conda-forge dependencies: - - python=3.7 + - python=3.8 - bottleneck - cartopy - cfgrib diff --git a/readthedocs.yml b/readthedocs.yml index 9ed8d28eaf2..ad249bf8c09 100644 --- a/readthedocs.yml +++ b/readthedocs.yml @@ -7,7 +7,7 @@ conda: environment: ci/requirements/doc.yml python: - version: 3.7 + version: 3.8 install: [] formats: [] From 4e0b232db2b8c717b396dc8d6f3cfe858a35a938 Mon Sep 17 00:00:00 2001 From: Guido Imperiale Date: Thu, 30 Jan 2020 15:02:03 +0000 Subject: [PATCH 6/7] Downgrade rtd to 3.7 --- ci/requirements/doc.yml | 2 +- readthedocs.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/requirements/doc.yml b/ci/requirements/doc.yml index b2e3ed7da52..a8b72dc0956 100644 --- a/ci/requirements/doc.yml +++ b/ci/requirements/doc.yml @@ -3,7 +3,7 @@ channels: # Don't change to pkgs/main, as it causes random timeouts in readthedocs - conda-forge dependencies: - - python=3.8 + - python=3.7 - bottleneck - cartopy - cfgrib diff --git a/readthedocs.yml b/readthedocs.yml index ad249bf8c09..9ed8d28eaf2 100644 --- a/readthedocs.yml +++ b/readthedocs.yml @@ -7,7 +7,7 @@ conda: environment: ci/requirements/doc.yml python: - version: 3.8 + version: 3.7 install: [] formats: [] From 6cc75f83af89a3db9f2bb026156a220a8ec6d656 Mon Sep 17 00:00:00 2001 From: Guido Imperiale Date: Thu, 30 Jan 2020 22:35:43 +0000 Subject: [PATCH 7/7] RTD to 3.8 again --- ci/requirements/doc.yml | 2 +- readthedocs.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/requirements/doc.yml b/ci/requirements/doc.yml index d8fb10fed10..2c44e754cc4 100644 --- a/ci/requirements/doc.yml +++ b/ci/requirements/doc.yml @@ -3,7 +3,7 @@ channels: # Don't change to pkgs/main, as it causes random timeouts in readthedocs - conda-forge dependencies: - - python=3.7 + - python=3.8 - bottleneck - cartopy - cfgrib diff --git a/readthedocs.yml b/readthedocs.yml index 9ed8d28eaf2..ad249bf8c09 100644 --- a/readthedocs.yml +++ b/readthedocs.yml @@ -7,7 +7,7 @@ conda: environment: ci/requirements/doc.yml python: - version: 3.7 + version: 3.8 install: [] formats: []