Skip to content
forked from pydata/xarray

Commit 426519f

Browse files
committed
Merge branch 'main' into kvikio
* main: (41 commits) v2023.01.0 whats-new (pydata#7440) explain keep_attrs in docstring of apply_ufunc (pydata#7445) Add sentence to open_dataset docstring (pydata#7438) pin scipy version in doc environment (pydata#7436) Improve performance for backend datetime handling (pydata#7374) fix typo (pydata#7433) Add lazy backend ASV test (pydata#7426) Pull Request Labeler - Workaround sync-labels bug (pydata#7431) see also : groupby in resample doc and vice-versa (pydata#7425) Some alignment optimizations (pydata#7382) Make `broadcast` and `concat` work with the Array API (pydata#7387) remove `numbagg` and `numba` from the upstream-dev CI (pydata#7416) [pre-commit.ci] pre-commit autoupdate (pydata#7402) Preserve original dtype when accessing MultiIndex levels (pydata#7393) [pre-commit.ci] pre-commit autoupdate (pydata#7389) [pre-commit.ci] pre-commit autoupdate (pydata#7360) COMPAT: Adjust CFTimeIndex.get_loc for pandas 2.0 deprecation enforcement (pydata#7361) Avoid loading entire dataset by getting the nbytes in an array (pydata#7356) `keep_attrs` for pad (pydata#7267) Bump pypa/gh-action-pypi-publish from 1.5.1 to 1.6.4 (pydata#7375) ...
2 parents 84f560f + d0bfd00 commit 426519f

File tree

134 files changed

+2782
-1384
lines changed

Some content is hidden

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

134 files changed

+2782
-1384
lines changed

.git_archival.txt

+3
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1+
node: $Format:%H$
2+
node-date: $Format:%cI$
3+
describe-name: $Format:%(describe:tags=true,match=*[0-9]*)$
14
ref-names: $Format:%D$

.github/labeler.yml

-4
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,6 @@ topic-indexing:
5454
- xarray/core/indexes.py
5555
- xarray/core/indexing.py
5656

57-
run-benchmark:
58-
- asv_bench/benchmarks/*
59-
- asv_bench/benchmarks/**/*
60-
6157
topic-performance:
6258
- asv_bench/benchmarks/*
6359
- asv_bench/benchmarks/**/*

.github/workflows/benchmarks.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
benchmark:
10-
if: ${{ contains( github.event.pull_request.labels.*.name, 'run-benchmark') && github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' }}
10+
if: ${{ contains( github.event.pull_request.labels.*.name, 'run-benchmark') && github.event_name == 'pull_request' || contains( github.event.pull_request.labels.*.name, 'topic-performance') && github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' }}
1111
name: Linux
1212
runs-on: ubuntu-20.04
1313
env:

.github/workflows/label-prs.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,6 @@ jobs:
99
- uses: actions/labeler@main
1010
with:
1111
repo-token: "${{ secrets.GITHUB_TOKEN }}"
12-
sync-labels: false
12+
# Workaround for sync-labels bug:
13+
# https://github.com/actions/labeler/issues/112
14+
sync-labels: ""

.github/workflows/pypi-release.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
7373
- name: Publish package to TestPyPI
7474
if: github.event_name == 'push'
75-
uses: pypa/gh-action-pypi-publish@v1.5.1
75+
uses: pypa/gh-action-pypi-publish@v1.6.4
7676
with:
7777
user: __token__
7878
password: ${{ secrets.TESTPYPI_TOKEN }}
@@ -90,7 +90,7 @@ jobs:
9090
name: releases
9191
path: dist
9292
- name: Publish package to PyPI
93-
uses: pypa/gh-action-pypi-publish@v1.5.1
93+
uses: pypa/gh-action-pypi-publish@v1.6.4
9494
with:
9595
user: __token__
9696
password: ${{ secrets.PYPI_TOKEN }}

.github/workflows/testpypi-release.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
7979
- name: Publish package to TestPyPI
8080
if: github.event_name == 'push'
81-
uses: pypa/gh-action-pypi-publish@v1.5.1
81+
uses: pypa/gh-action-pypi-publish@v1.6.4
8282
with:
8383
user: __token__
8484
password: ${{ secrets.TESTPYPI_TOKEN }}

.pre-commit-config.yaml

+13-7
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,38 @@
11
# https://pre-commit.com/
22
repos:
33
- repo: https://github.com/pre-commit/pre-commit-hooks
4-
rev: v4.3.0
4+
rev: v4.4.0
55
hooks:
66
- id: trailing-whitespace
77
- id: end-of-file-fixer
88
- id: check-yaml
99
- id: debug-statements
1010
- id: mixed-line-ending
11+
- repo: https://github.com/MarcoGorelli/absolufy-imports
12+
rev: v0.3.1
13+
hooks:
14+
- id: absolufy-imports
15+
name: absolufy-imports
16+
files: ^xarray/
1117
# This wants to go before isort & flake8
1218
- repo: https://github.com/PyCQA/autoflake
13-
rev: "v1.7.7"
19+
rev: "v2.0.0"
1420
hooks:
1521
- id: autoflake # isort should run before black as black sometimes tweaks the isort output
1622
args: ["--in-place", "--ignore-init-module-imports"]
1723
- repo: https://github.com/PyCQA/isort
18-
rev: 5.10.1
24+
rev: 5.11.4
1925
hooks:
2026
- id: isort
2127
- repo: https://github.com/asottile/pyupgrade
22-
rev: v3.2.2
28+
rev: v3.3.1
2329
hooks:
2430
- id: pyupgrade
2531
args:
2632
- "--py38-plus"
2733
# https://github.com/python/black#version-control-integration
2834
- repo: https://github.com/psf/black
29-
rev: 22.10.0
35+
rev: 22.12.0
3036
hooks:
3137
- id: black
3238
- id: black-jupyter
@@ -35,10 +41,10 @@ repos:
3541
hooks:
3642
- id: blackdoc
3743
exclude: "generate_aggregations.py"
38-
additional_dependencies: ["black==22.10.0"]
44+
additional_dependencies: ["black==22.12.0"]
3945
- id: blackdoc-autoupdate-black
4046
- repo: https://github.com/PyCQA/flake8
41-
rev: 5.0.4
47+
rev: 6.0.0
4248
hooks:
4349
- id: flake8
4450
# - repo: https://github.com/Carreau/velin

asv_bench/asv.conf.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@
5858
// "pip+emcee": [""], // emcee is only available for install with pip.
5959
// },
6060
"matrix": {
61-
"setuptools_scm[toml]": [""], // GH6609
62-
"setuptools_scm_git_archive": [""], // GH6609
61+
"setuptools_scm": [""], // GH6609
6362
"numpy": [""],
6463
"pandas": [""],
6564
"netcdf4": [""],

0 commit comments

Comments
 (0)