Skip to content

Commit aa4ea00

Browse files
dcheriandcherian
committed
Merge remote-tracking branch 'upstream/master' into map_blocks_2
* upstream/master: Remove setting of universal wheels (pydata#3367) Revisit # noqa annotations (pydata#3359) Fix codecov.io upload on Windows (pydata#3360) Add how do I ... section (pydata#3357) Add glossary to documentation (pydata#3352) Documentation improvements (pydata#3328) Remove `complex.nc` from built docs (pydata#3353) Fix DataArray.to_netcdf type annotation (pydata#3325) CI test suites with pinned minimum dependencies (pydata#3346) Bugfix/plot accept coord dim (pydata#3345) CI environments overhaul (pydata#3340) Add hypothesis support to related projects (pydata#3335) More doc fixes (pydata#3333) Improve the documentation of swap_dims (pydata#3331) fix the doc names of the return value of swap_dims (pydata#3329)
2 parents 8ad882b + dd2b803 commit aa4ea00

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1433
-323
lines changed

‎asv_bench/benchmarks/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def decorator(func):
1616

1717
def requires_dask():
1818
try:
19-
import dask # noqa
19+
import dask # noqa: F401
2020
except ImportError:
2121
raise NotImplementedError
2222

‎asv_bench/benchmarks/dataarray_missing.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from . import randn, requires_dask
66

77
try:
8-
import dask # noqa
8+
import dask # noqa: F401
99
except ImportError:
1010
pass
1111

‎azure-pipelines.yml

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,20 @@ jobs:
88
- job: Linux
99
strategy:
1010
matrix:
11-
py35-min:
12-
conda_env: py35-min
11+
py35-bare-minimum:
12+
conda_env: py35-bare-minimum
13+
py36-min-all-deps:
14+
conda_env: py36-min-all-deps
15+
py36-min-nep18:
16+
conda_env: py36-min-nep18
1317
py36:
1418
conda_env: py36
1519
py37:
1620
conda_env: py37
1721
py37-upstream-dev:
1822
conda_env: py37
1923
upstream_dev: true
20-
py36-flakey:
24+
py36-flaky:
2125
conda_env: py36
2226
pytest_extra_flags: --run-flaky --run-network-tests
2327
allow_failure: true
@@ -90,15 +94,3 @@ jobs:
9094
cd doc
9195
sphinx-build -n -j auto -b html -d _build/doctrees . _build/html
9296
displayName: Build HTML docs
93-
94-
- job: LinuxHypothesis
95-
variables:
96-
conda_env: py36-hypothesis
97-
pool:
98-
vmImage: 'ubuntu-16.04'
99-
steps:
100-
- template: ci/azure/install.yml
101-
- bash: |
102-
source activate xarray-tests
103-
pytest properties
104-
displayName: Property based tests

‎ci/azure/unit-tests.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,16 @@ steps:
1111
# https://github.com/microsoft/azure-pipelines-tasks/issues/9302
1212
- bash: |
1313
source activate xarray-tests
14-
pytest xarray \
14+
pytest \
1515
--junitxml=junit/test-results.xml \
1616
--cov=xarray \
1717
--cov-report=xml \
1818
$(pytest_extra_flags) || [ "$ALLOW_FAILURE" = "true" ]
1919
displayName: Run tests
2020

2121
- bash: |
22-
bash <(curl https://codecov.io/bash) -t 688f4d53-31bb-49b5-8370-4ce6f792cf3d
22+
curl https://codecov.io/bash > codecov.sh
23+
bash codecov.sh -t 688f4d53-31bb-49b5-8370-4ce6f792cf3d
2324
displayName: Upload coverage to codecov.io
2425

2526
# TODO: publish coverage results to Azure, once we can merge them across

‎ci/requirements/py35-min.yml renamed to ‎ci/requirements/py35-bare-minimum.yml

File renamed without changes.

‎ci/requirements/py36-hypothesis.yml

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

‎ci/requirements/py36-min-all-deps.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: xarray-tests
2+
channels:
3+
- conda-forge
4+
dependencies:
5+
- python=3.6.7
6+
- black
7+
- boto3=1.9.235
8+
- bottleneck=1.2.1
9+
- cdms2=3.1.3
10+
- cfgrib=0.9.7.2
11+
- cftime=1.0.3.4
12+
- coveralls
13+
- dask=2.4.0
14+
- distributed=2.4.0
15+
- flake8
16+
- h5netcdf=0.7.4
17+
- h5py=2.10.0
18+
- hdf5=1.10.5
19+
- hypothesis
20+
- iris=2.2.0
21+
- lxml=4.4.1 # optional dep of pydap
22+
- matplotlib=3.1.1
23+
- mypy==0.720 # Must match .pre-commit-config.yaml
24+
- nc-time-axis=1.2.0
25+
- netcdf4=1.5.1.2
26+
- numba=0.45.1
27+
- numpy=1.17.2
28+
- pandas=0.25.1
29+
- pip
30+
- pseudonetcdf=3.0.2
31+
- pydap=3.2.2
32+
- pynio=1.5.5
33+
- pytest
34+
- pytest-cov
35+
- pytest-env
36+
- rasterio=1.0.28
37+
- scipy=1.3.1
38+
- seaborn=0.9.0
39+
# - sparse # See py36-min-nep18.yml
40+
- toolz=0.10.0
41+
- zarr=2.3.2
42+
- pip:
43+
- numbagg==0.1

‎ci/requirements/py36-min-nep18.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: xarray-tests
2+
channels:
3+
- conda-forge
4+
dependencies:
5+
# Optional dependencies that require NEP18, such as sparse,
6+
# require drastically newer packages than everything else
7+
- python=3.6.7
8+
- coveralls
9+
- dask=2.4.0
10+
- distributed=2.4.0
11+
- numpy=1.17
12+
- pandas=0.25
13+
- pytest
14+
- pytest-cov
15+
- pytest-env
16+
- scipy=1.3
17+
- sparse=0.8.0

‎ci/requirements/py36.yml

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,41 @@ channels:
33
- conda-forge
44
dependencies:
55
- python=3.6
6+
- black
7+
- boto3
8+
- bottleneck
9+
- cdms2
10+
- cfgrib>=0.9.2
611
- cftime
12+
- coveralls
713
- dask
814
- distributed
9-
- h5py
15+
- flake8
1016
- h5netcdf
17+
- h5py
18+
- hdf5
19+
- hypothesis
20+
- iris>=1.10
21+
- lxml # optional dep of pydap
1122
- matplotlib
12-
- netcdf4
13-
- pytest
14-
- pytest-cov
15-
- pytest-env
16-
- coveralls
17-
- flake8
1823
- mypy==0.720 # Must match .pre-commit-config.yaml
24+
- nc-time-axis
25+
- netcdf4
26+
- numba
1927
- numpy>=1.12
2028
- pandas>=0.19
2129
- pip
30+
- pseudonetcdf>=3.0.1
31+
- pydap
32+
- pynio
33+
- pytest
34+
- pytest-cov
35+
- pytest-env
36+
- rasterio
2237
- scipy
2338
- seaborn
39+
- sparse
2440
- toolz
25-
- rasterio
26-
- boto3
27-
- bottleneck
2841
- zarr
29-
- pseudonetcdf>=3.0.1
30-
- cfgrib>=0.9.2
31-
- cdms2
32-
# Disabled due to conflicting dependencies:
33-
# https://github.com/pydata/xarray/issues/3154
34-
# - pynio
35-
- iris>=1.10
36-
- pydap
37-
- lxml
38-
42+
- pip:
43+
- numbagg

‎ci/requirements/py37-windows.yml

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,41 @@ channels:
33
- conda-forge
44
dependencies:
55
- python=3.7
6+
- black
7+
- boto3
8+
- bottleneck
9+
# - cdms2 # Not available on Windows
10+
# - cfgrib>=0.9.2 # Causes Python interpreter crash on Windows
611
- cftime
7-
- nc-time-axis
12+
- coveralls
813
- dask
914
- distributed
10-
- h5py
15+
- flake8
1116
- h5netcdf
17+
- h5py
18+
- hdf5
19+
- hypothesis
20+
- iris>=1.10
21+
- lxml # optional dep of pydap
1222
- matplotlib
23+
- mypy==0.720 # Must match .pre-commit-config.yaml
24+
- nc-time-axis
1325
- netcdf4
14-
- pytest
15-
- pytest-cov
16-
- pytest-env
17-
- coveralls
26+
- numba
1827
- numpy>=1.12
1928
- pandas>=0.19
2029
- pip
30+
- pseudonetcdf>=3.0.1
31+
- pydap
32+
# - pynio # Not available on Windows
33+
- pytest
34+
- pytest-cov
35+
- pytest-env
36+
- rasterio
2137
- scipy
2238
- seaborn
39+
- sparse
2340
- toolz
24-
- rasterio
25-
- boto3
2641
- zarr
42+
- pip:
43+
- numbagg

0 commit comments

Comments
 (0)