Skip to content
forked from pydata/xarray

Commit

Permalink
Merge branch 'main' into generate-reductions-class
Browse files Browse the repository at this point in the history
* 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)
  ...
  • Loading branch information
dcherian committed Feb 16, 2022
2 parents 8336c53 + 18703ba commit cd51a15
Show file tree
Hide file tree
Showing 66 changed files with 2,414 additions and 394 deletions.
39 changes: 0 additions & 39 deletions .github/ISSUE_TEMPLATE/bug-report.md

This file was deleted.

61 changes: 61 additions & 0 deletions .github/ISSUE_TEMPLATE/bugreport.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
name: Bug Report
description: File a bug report to help us improve
title: '[Bug]: '
labels: [bug, 'needs triage']
assignees: []
body:
- type: textarea
id: what-happened
attributes:
label: What happened?
description: |
Thanks for reporting a bug! Please describe what you were trying to get done.
Tell us what happened, what went wrong.
validations:
required: true

- type: textarea
id: what-did-you-expect-to-happen
attributes:
label: What did you expect to happen?
description: |
Describe what you expected to happen.
validations:
required: false

- type: textarea
id: sample-code
attributes:
label: Minimal Complete Verifiable Example
description: |
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:
- [Minimal Complete Verifiable Examples](https://stackoverflow.com/help/mcve)
- [Craft Minimal Bug Reports](http://matthewrocklin.com/blog/work/2018/02/28/minimal-bug-reports)
Bug reports that follow these guidelines are easier to diagnose, and so are often handled much more quickly.
This will be automatically formatted into code, so no need for markdown backticks.
render: python

- type: textarea
id: log-output
attributes:
label: Relevant log output
description: Please copy and paste any relevant output. This will be automatically formatted into code, so no need for markdown backticks.
render: python

- type: textarea
id: extra
attributes:
label: Anything else we need to know?
description: |
Please describe any other information you want to share.
- type: textarea
id: show-versions
attributes:
label: Environment
description: |
Paste the output of `xr.show_versions()` here
validations:
required: true
22 changes: 0 additions & 22 deletions .github/ISSUE_TEMPLATE/feature-request.md

This file was deleted.

37 changes: 37 additions & 0 deletions .github/ISSUE_TEMPLATE/newfeature.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Feature Request
description: Suggest an idea for xarray
title: '[FEATURE]: '
labels: [enhancement]
assignees: []
body:
- type: textarea
id: description
attributes:
label: Is your feature request related to a problem?
description: |
Please do a quick search of existing issues to make sure that this has not been asked before.
Please provide a clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
validations:
required: true
- type: textarea
id: solution
attributes:
label: Describe the solution you'd like
description: |
A clear and concise description of what you want to happen.
- type: textarea
id: alternatives
attributes:
label: Describe alternatives you've considered
description: |
A clear and concise description of any alternative solutions or features you've considered.
validations:
required: false
- type: textarea
id: additional-context
attributes:
label: Additional context
description: |
Add any other context about the feature request here.
validations:
required: false
1 change: 0 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@

- [ ] Closes #xxxx
- [ ] Tests added
- [ ] Passes `pre-commit run --all-files`
- [ ] User visible changes (including notable bug fixes) are documented in `whats-new.rst`
- [ ] New functions/methods are listed in `api.rst`
25 changes: 14 additions & 11 deletions .github/workflows/ci-additional.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,13 @@ jobs:
os: ["ubuntu-latest"]
env:
[
"py37-bare-minimum",
"py37-min-all-deps",
"py38-all-but-dask",
"py38-flaky",
# Minimum python version:
"py38-bare-minimum",
"py38-min-all-deps",

# Latest python version:
"py39-all-but-dask",
"py39-flaky",
]
steps:
- uses: actions/checkout@v2
Expand All @@ -52,7 +55,7 @@ jobs:

- name: Set environment variables
run: |
if [[ ${{ matrix.env }} == "py38-flaky" ]] ;
if [[ ${{ matrix.env }} == "py39-flaky" ]] ;
then
echo "CONDA_ENV_FILE=ci/requirements/environment.yml" >> $GITHUB_ENV
echo "PYTEST_EXTRA_FLAGS=--run-flaky --run-network-tests" >> $GITHUB_ENV
Expand All @@ -75,7 +78,7 @@ jobs:
mamba-version: "*"
activate-environment: xarray-tests
auto-update-conda: false
python-version: 3.8
python-version: 3.9
use-only-tar-bz2: true

- name: Install conda dependencies
Expand All @@ -96,7 +99,7 @@ jobs:
python -c "import xarray"
- name: Run tests
run: |
python -m pytest \
python -m pytest -n 4 \
--cov=xarray \
--cov-report=xml \
$PYTEST_EXTRA_FLAGS
Expand Down Expand Up @@ -128,7 +131,7 @@ jobs:
mamba-version: "*"
activate-environment: xarray-tests
auto-update-conda: false
python-version: "3.8"
python-version: "3.9"

- name: Install conda dependencies
run: |
Expand Down Expand Up @@ -164,10 +167,10 @@ jobs:
channel-priority: strict
mamba-version: "*"
auto-update-conda: false
python-version: "3.8"
python-version: "3.9"

- name: minimum versions policy
run: |
mamba install -y pyyaml conda python-dateutil
python ci/min_deps_check.py ci/requirements/py37-bare-minimum.yml
python ci/min_deps_check.py ci/requirements/py37-min-all-deps.yml
python ci/min_deps_check.py ci/requirements/py38-bare-minimum.yml
python ci/min_deps_check.py ci/requirements/py38-min-all-deps.yml
17 changes: 0 additions & 17 deletions .github/workflows/ci-pre-commit.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
matrix:
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
# Bookend python versions
python-version: ["3.7", "3.9"]
python-version: ["3.8", "3.9"]
steps:
- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
run: |
python -c "import xarray"
- name: Run tests
run: python -m pytest
run: python -m pytest -n 4
--cov=xarray
--cov-report=xml
--junitxml=pytest.xml
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pypi-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
ls -ltrh dist
- name: Publish package to TestPyPI
if: github.event_name == 'push'
uses: pypa/gh-action-pypi-publish@v1.4.2
uses: pypa/gh-action-pypi-publish@v1.5.0
with:
user: __token__
password: ${{ secrets.TESTPYPI_TOKEN }}
Expand All @@ -89,7 +89,7 @@ jobs:
name: releases
path: dist
- name: Publish package to PyPI
uses: pypa/gh-action-pypi-publish@v1.4.2
uses: pypa/gh-action-pypi-publish@v1.5.0
with:
user: __token__
password: ${{ secrets.PYPI_TOKEN }}
Expand Down
6 changes: 2 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# https://pre-commit.com/
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.0.1
rev: v4.1.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
Expand Down Expand Up @@ -32,7 +32,7 @@ repos:
# - id: velin
# args: ["--write", "--compact"]
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.930
rev: v0.931
hooks:
- id: mypy
# `properies` & `asv_bench` are copied from setup.cfg.
Expand All @@ -45,8 +45,6 @@ repos:
types-PyYAML,
types-pytz,
typing-extensions==3.10.0.0,
# Dependencies that are typed
numpy,
]
# run this occasionally, ref discussion https://github.com/pydata/xarray/pull/3194
# - repo: https://github.com/asottile/pyupgrade
Expand Down
9 changes: 0 additions & 9 deletions asv_bench/benchmarks/import_xarray.py

This file was deleted.

1 change: 0 additions & 1 deletion ci/requirements/environment-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ dependencies:
- rasterio
- scipy
- seaborn
- setuptools
- sparse
- toolz
- typing_extensions
Expand Down
1 change: 0 additions & 1 deletion ci/requirements/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ dependencies:
- rasterio
- scipy
- seaborn
- setuptools
- sparse
- toolz
- typing_extensions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ channels:
- conda-forge
- nodefaults
dependencies:
- python=3.7
- python=3.8
- coveralls
- pip
- pytest
Expand All @@ -12,5 +12,3 @@ dependencies:
- pytest-xdist
- numpy=1.18
- pandas=1.1
- typing_extensions=3.7
- importlib-metadata=2.0
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies:
# Run ci/min_deps_check.py to verify that this file respects the policy.
# When upgrading python, numpy, or pandas, must also change
# doc/installing.rst and setup.py.
- python=3.7
- python=3.8
- boto3=1.13
- bottleneck=1.3
# cartopy 0.18 conflicts with pynio
Expand All @@ -24,7 +24,6 @@ dependencies:
- hdf5=1.10
- hypothesis
- iris=2.4
- importlib-metadata=2.0
- lxml=4.6 # Optional dep of pydap
- matplotlib-base=3.3
- nc-time-axis=1.2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ channels:
- conda-forge
- nodefaults
dependencies:
- python=3.8
- python=3.9
- black
- aiobotocore
- boto3
Expand Down Expand Up @@ -36,7 +36,6 @@ dependencies:
- rasterio
- scipy
- seaborn
- setuptools
- sparse
- toolz
- typing_extensions
Expand Down
Binary file modified doc/_static/dataset-diagram.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit cd51a15

Please sign in to comment.