Skip to content
forked from pydata/xarray

Commit cd51a15

Browse files
committed
Merge branch 'main' into generate-reductions-class
* main: (32 commits) Small typing fix (pydata#6159) Drop support for python 3.7 (pydata#5892) _season_from_months can now handle np.nan (pydata#5876) Use base ImportError not MoudleNotFoundError when trying to see if the (pydata#6154) Remove numpy from mypy pre-commit (pydata#6151) Change concat dims to be Hashable (pydata#6121) Bump pypa/gh-action-pypi-publish from 1.4.2 to 1.5.0 (pydata#6147) Remove registration of pandas datetime converter in plotting (pydata#6109) Remove pd.Panel checks (pydata#6145) Remove paren from DataArray.from_dict docstring (pydata#6140) Revert "Deprecate bool(ds) (pydata#6126)" (pydata#6141) remove paren from data that is fed to 1D DataArray (pydata#6139) Check for just `...`, rather than `[...]` in `da.stack` (pydata#6132) DOC: Add "auto" to dataarray `chunk` method (pydata#6068) TST: check datetime converter is Matplotlibs (pydata#6128) New algorithm for forward filling (pydata#6118) Limit and format number of displayed dimensions in repr (pydata#5662) Add labels to dataset diagram (pydata#6076) Deprecate bool(ds) (pydata#6126) Revert "disable pytest-xdist (to check CI failure)" (pydata#6127) ...
2 parents 8336c53 + 18703ba commit cd51a15

Some content is hidden

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

66 files changed

+2414
-394
lines changed

.github/ISSUE_TEMPLATE/bug-report.md

-39
This file was deleted.

.github/ISSUE_TEMPLATE/bugreport.yml

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
name: Bug Report
2+
description: File a bug report to help us improve
3+
title: '[Bug]: '
4+
labels: [bug, 'needs triage']
5+
assignees: []
6+
body:
7+
- type: textarea
8+
id: what-happened
9+
attributes:
10+
label: What happened?
11+
description: |
12+
Thanks for reporting a bug! Please describe what you were trying to get done.
13+
Tell us what happened, what went wrong.
14+
validations:
15+
required: true
16+
17+
- type: textarea
18+
id: what-did-you-expect-to-happen
19+
attributes:
20+
label: What did you expect to happen?
21+
description: |
22+
Describe what you expected to happen.
23+
validations:
24+
required: false
25+
26+
- type: textarea
27+
id: sample-code
28+
attributes:
29+
label: Minimal Complete Verifiable Example
30+
description: |
31+
Minimal, self-contained copy-pastable example that generates the issue if possible. Please be concise with code posted. See guidelines below on how to provide a good bug report:
32+
33+
- [Minimal Complete Verifiable Examples](https://stackoverflow.com/help/mcve)
34+
- [Craft Minimal Bug Reports](http://matthewrocklin.com/blog/work/2018/02/28/minimal-bug-reports)
35+
36+
Bug reports that follow these guidelines are easier to diagnose, and so are often handled much more quickly.
37+
This will be automatically formatted into code, so no need for markdown backticks.
38+
render: python
39+
40+
- type: textarea
41+
id: log-output
42+
attributes:
43+
label: Relevant log output
44+
description: Please copy and paste any relevant output. This will be automatically formatted into code, so no need for markdown backticks.
45+
render: python
46+
47+
- type: textarea
48+
id: extra
49+
attributes:
50+
label: Anything else we need to know?
51+
description: |
52+
Please describe any other information you want to share.
53+
54+
- type: textarea
55+
id: show-versions
56+
attributes:
57+
label: Environment
58+
description: |
59+
Paste the output of `xr.show_versions()` here
60+
validations:
61+
required: true

.github/ISSUE_TEMPLATE/feature-request.md

-22
This file was deleted.

.github/ISSUE_TEMPLATE/newfeature.yml

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Feature Request
2+
description: Suggest an idea for xarray
3+
title: '[FEATURE]: '
4+
labels: [enhancement]
5+
assignees: []
6+
body:
7+
- type: textarea
8+
id: description
9+
attributes:
10+
label: Is your feature request related to a problem?
11+
description: |
12+
Please do a quick search of existing issues to make sure that this has not been asked before.
13+
Please provide a clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
14+
validations:
15+
required: true
16+
- type: textarea
17+
id: solution
18+
attributes:
19+
label: Describe the solution you'd like
20+
description: |
21+
A clear and concise description of what you want to happen.
22+
- type: textarea
23+
id: alternatives
24+
attributes:
25+
label: Describe alternatives you've considered
26+
description: |
27+
A clear and concise description of any alternative solutions or features you've considered.
28+
validations:
29+
required: false
30+
- type: textarea
31+
id: additional-context
32+
attributes:
33+
label: Additional context
34+
description: |
35+
Add any other context about the feature request here.
36+
validations:
37+
required: false

.github/PULL_REQUEST_TEMPLATE.md

-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22

33
- [ ] Closes #xxxx
44
- [ ] Tests added
5-
- [ ] Passes `pre-commit run --all-files`
65
- [ ] User visible changes (including notable bug fixes) are documented in `whats-new.rst`
76
- [ ] New functions/methods are listed in `api.rst`

.github/workflows/ci-additional.yaml

+14-11
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,13 @@ jobs:
4040
os: ["ubuntu-latest"]
4141
env:
4242
[
43-
"py37-bare-minimum",
44-
"py37-min-all-deps",
45-
"py38-all-but-dask",
46-
"py38-flaky",
43+
# Minimum python version:
44+
"py38-bare-minimum",
45+
"py38-min-all-deps",
46+
47+
# Latest python version:
48+
"py39-all-but-dask",
49+
"py39-flaky",
4750
]
4851
steps:
4952
- uses: actions/checkout@v2
@@ -52,7 +55,7 @@ jobs:
5255

5356
- name: Set environment variables
5457
run: |
55-
if [[ ${{ matrix.env }} == "py38-flaky" ]] ;
58+
if [[ ${{ matrix.env }} == "py39-flaky" ]] ;
5659
then
5760
echo "CONDA_ENV_FILE=ci/requirements/environment.yml" >> $GITHUB_ENV
5861
echo "PYTEST_EXTRA_FLAGS=--run-flaky --run-network-tests" >> $GITHUB_ENV
@@ -75,7 +78,7 @@ jobs:
7578
mamba-version: "*"
7679
activate-environment: xarray-tests
7780
auto-update-conda: false
78-
python-version: 3.8
81+
python-version: 3.9
7982
use-only-tar-bz2: true
8083

8184
- name: Install conda dependencies
@@ -96,7 +99,7 @@ jobs:
9699
python -c "import xarray"
97100
- name: Run tests
98101
run: |
99-
python -m pytest \
102+
python -m pytest -n 4 \
100103
--cov=xarray \
101104
--cov-report=xml \
102105
$PYTEST_EXTRA_FLAGS
@@ -128,7 +131,7 @@ jobs:
128131
mamba-version: "*"
129132
activate-environment: xarray-tests
130133
auto-update-conda: false
131-
python-version: "3.8"
134+
python-version: "3.9"
132135

133136
- name: Install conda dependencies
134137
run: |
@@ -164,10 +167,10 @@ jobs:
164167
channel-priority: strict
165168
mamba-version: "*"
166169
auto-update-conda: false
167-
python-version: "3.8"
170+
python-version: "3.9"
168171

169172
- name: minimum versions policy
170173
run: |
171174
mamba install -y pyyaml conda python-dateutil
172-
python ci/min_deps_check.py ci/requirements/py37-bare-minimum.yml
173-
python ci/min_deps_check.py ci/requirements/py37-min-all-deps.yml
175+
python ci/min_deps_check.py ci/requirements/py38-bare-minimum.yml
176+
python ci/min_deps_check.py ci/requirements/py38-min-all-deps.yml

.github/workflows/ci-pre-commit.yml

-17
This file was deleted.

.github/workflows/ci.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
matrix:
3939
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
4040
# Bookend python versions
41-
python-version: ["3.7", "3.9"]
41+
python-version: ["3.8", "3.9"]
4242
steps:
4343
- uses: actions/checkout@v2
4444
with:
@@ -87,7 +87,7 @@ jobs:
8787
run: |
8888
python -c "import xarray"
8989
- name: Run tests
90-
run: python -m pytest
90+
run: python -m pytest -n 4
9191
--cov=xarray
9292
--cov-report=xml
9393
--junitxml=pytest.xml

.github/workflows/pypi-release.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
ls -ltrh dist
6565
- name: Publish package to TestPyPI
6666
if: github.event_name == 'push'
67-
uses: pypa/gh-action-pypi-publish@v1.4.2
67+
uses: pypa/gh-action-pypi-publish@v1.5.0
6868
with:
6969
user: __token__
7070
password: ${{ secrets.TESTPYPI_TOKEN }}
@@ -89,7 +89,7 @@ jobs:
8989
name: releases
9090
path: dist
9191
- name: Publish package to PyPI
92-
uses: pypa/gh-action-pypi-publish@v1.4.2
92+
uses: pypa/gh-action-pypi-publish@v1.5.0
9393
with:
9494
user: __token__
9595
password: ${{ secrets.PYPI_TOKEN }}

.pre-commit-config.yaml

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# https://pre-commit.com/
22
repos:
33
- repo: https://github.com/pre-commit/pre-commit-hooks
4-
rev: v4.0.1
4+
rev: v4.1.0
55
hooks:
66
- id: trailing-whitespace
77
- id: end-of-file-fixer
@@ -32,7 +32,7 @@ repos:
3232
# - id: velin
3333
# args: ["--write", "--compact"]
3434
- repo: https://github.com/pre-commit/mirrors-mypy
35-
rev: v0.930
35+
rev: v0.931
3636
hooks:
3737
- id: mypy
3838
# `properies` & `asv_bench` are copied from setup.cfg.
@@ -45,8 +45,6 @@ repos:
4545
types-PyYAML,
4646
types-pytz,
4747
typing-extensions==3.10.0.0,
48-
# Dependencies that are typed
49-
numpy,
5048
]
5149
# run this occasionally, ref discussion https://github.com/pydata/xarray/pull/3194
5250
# - repo: https://github.com/asottile/pyupgrade

asv_bench/benchmarks/import_xarray.py

-9
This file was deleted.

ci/requirements/environment-windows.yml

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ dependencies:
3636
- rasterio
3737
- scipy
3838
- seaborn
39-
- setuptools
4039
- sparse
4140
- toolz
4241
- typing_extensions

ci/requirements/environment.yml

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ dependencies:
4040
- rasterio
4141
- scipy
4242
- seaborn
43-
- setuptools
4443
- sparse
4544
- toolz
4645
- typing_extensions

ci/requirements/py37-bare-minimum.yml renamed to ci/requirements/py38-bare-minimum.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ channels:
33
- conda-forge
44
- nodefaults
55
dependencies:
6-
- python=3.7
6+
- python=3.8
77
- coveralls
88
- pip
99
- pytest
@@ -12,5 +12,3 @@ dependencies:
1212
- pytest-xdist
1313
- numpy=1.18
1414
- pandas=1.1
15-
- typing_extensions=3.7
16-
- importlib-metadata=2.0

ci/requirements/py37-min-all-deps.yml renamed to ci/requirements/py38-min-all-deps.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencies:
77
# Run ci/min_deps_check.py to verify that this file respects the policy.
88
# When upgrading python, numpy, or pandas, must also change
99
# doc/installing.rst and setup.py.
10-
- python=3.7
10+
- python=3.8
1111
- boto3=1.13
1212
- bottleneck=1.3
1313
# cartopy 0.18 conflicts with pynio
@@ -24,7 +24,6 @@ dependencies:
2424
- hdf5=1.10
2525
- hypothesis
2626
- iris=2.4
27-
- importlib-metadata=2.0
2827
- lxml=4.6 # Optional dep of pydap
2928
- matplotlib-base=3.3
3029
- nc-time-axis=1.2

ci/requirements/py38-all-but-dask.yml renamed to ci/requirements/py39-all-but-dask.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ channels:
33
- conda-forge
44
- nodefaults
55
dependencies:
6-
- python=3.8
6+
- python=3.9
77
- black
88
- aiobotocore
99
- boto3
@@ -36,7 +36,6 @@ dependencies:
3636
- rasterio
3737
- scipy
3838
- seaborn
39-
- setuptools
4039
- sparse
4140
- toolz
4241
- typing_extensions

doc/_static/dataset-diagram.png

-10.5 KB
Loading

0 commit comments

Comments
 (0)