Skip to content

Commit b9c1e6f

Browse files
committed
Merge remote-tracking branch 'upstream/master' into integrate_dim_arg
* upstream/master: (342 commits) fix decode for scale/ offset list (pydata#4802) Expand user dir paths (~) in open_mfdataset and to_zarr. (pydata#4795) add a version info step to the upstream-dev CI (pydata#4815) fix the ci trigger action (pydata#4805) scatter plot by order of the first appearance of hue (pydata#4723) don't skip the scheduled CI (pydata#4806) coords: retain str dtype (pydata#4759) Fix interval labels with units (pydata#4794) Always force dask arrays to float in missing.interp_func (pydata#4771) Print number of variables in repr (pydata#4762) install conda as a library in the minimum dependency check CI (pydata#4792) Migrate CI from azure pipelines to GitHub Actions (pydata#4730) use conda.api instead of parallel calls to the conda binary (pydata#4775) Speed up missing._get_interpolator (pydata#4776) Remove special case in guess_engines (pydata#4777) improve typing of OrderedSet (pydata#4774) CI: ignore some warnings (pydata#4773) DOC: update hyperlink for xskillscore (pydata#4778) drop support for python 3.6 (pydata#4720) Trigger upstream CI on cron schedule (by default) (pydata#4729) ...
2 parents ecb7cb1 + a2b1712 commit b9c1e6f

File tree

194 files changed

+18165
-7945
lines changed

Some content is hidden

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

194 files changed

+18165
-7945
lines changed

.coveragerc

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[run]
22
omit =
3-
xarray/tests/*
4-
xarray/core/dask_array_compat.py
5-
xarray/core/npcompat.py
6-
xarray/core/pdcompat.py
7-
xarray/core/pycompat.py
3+
*/xarray/tests/*
4+
*/xarray/core/dask_array_compat.py
5+
*/xarray/core/npcompat.py
6+
*/xarray/core/pdcompat.py
7+
*/xarray/core/pycompat.py

.github/ISSUE_TEMPLATE/bug-report.md

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
<!-- Please include a self-contained copy-pastable example that generates the issue if possible.
11+
12+
Please be concise with code posted. See guidelines below on how to provide a good bug report:
13+
14+
- Craft Minimal Bug Reports: http://matthewrocklin.com/blog/work/2018/02/28/minimal-bug-reports
15+
- Minimal Complete Verifiable Examples: https://stackoverflow.com/help/mcve
16+
17+
Bug reports that follow these guidelines are easier to diagnose, and so are often handled much more quickly.
18+
-->
19+
20+
**What happened**:
21+
22+
**What you expected to happen**:
23+
24+
**Minimal Complete Verifiable Example**:
25+
26+
```python
27+
# Put your MCVE code here
28+
```
29+
30+
**Anything else we need to know?**:
31+
32+
**Environment**:
33+
34+
<details><summary>Output of <tt>xr.show_versions()</tt></summary>
35+
36+
<!-- Paste the output here xr.show_versions() here -->
37+
38+
39+
</details>

.github/ISSUE_TEMPLATE/bug_report.md

-35
This file was deleted.

.github/ISSUE_TEMPLATE/config.yml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Usage question
4+
url: https://github.com/pydata/xarray/discussions
5+
about: |
6+
Ask questions and discuss with other community members here.
7+
If you have a question like "How do I concatenate a list of datasets?" then
8+
please include a self-contained reproducible example if possible.
+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
<!-- Please do a quick search of existing issues to make sure that this has not been asked before. -->
11+
12+
**Is your feature request related to a problem? Please describe.**
13+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
14+
15+
**Describe the solution you'd like**
16+
A clear and concise description of what you want to happen.
17+
18+
**Describe alternatives you've considered**
19+
A clear and concise description of any alternative solutions or features you've considered.
20+
21+
**Additional context**
22+
Add any other context about the feature request here.

.github/PULL_REQUEST_TEMPLATE.md

+13-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
<!-- Feel free to remove check-list items aren't relevant to your change -->
22

3-
- [ ] Closes #xxxx
4-
- [ ] Tests added
5-
- [ ] Passes `isort -rc . && black . && mypy . && flake8`
6-
- [ ] Fully documented, including `whats-new.rst` for all changes and `api.rst` for new API
3+
- [ ] Closes #xxxx
4+
- [ ] Tests added
5+
- [ ] Passes `pre-commit run --all-files`
6+
- [ ] User visible changes (including notable bug fixes) are documented in `whats-new.rst`
7+
- [ ] New functions/methods are listed in `api.rst`
8+
9+
10+
<sub>
11+
<h3>
12+
Overriding CI behaviors
13+
</h3>
14+
By default, the upstream dev CI is disabled on pull request and push events. You can override this behavior per commit by adding a <tt>[test-upstream]</tt> tag to the first line of the commit message. For documentation-only commits, you can skip the CI per commit by adding a <tt>[skip-ci]</tt> tag to the first line of the commit message
15+
</sub>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Detect CI Trigger
2+
description: |
3+
Detect a keyword used to control the CI in the subject line of a commit message.
4+
inputs:
5+
keyword:
6+
description: |
7+
The keyword to detect.
8+
required: true
9+
outputs:
10+
trigger-found:
11+
description: |
12+
true if the keyword has been found in the subject line of the commit message
13+
value: ${{ steps.detect-trigger.outputs.CI_TRIGGERED }}
14+
runs:
15+
using: "composite"
16+
steps:
17+
- name: detect trigger
18+
id: detect-trigger
19+
run: |
20+
bash $GITHUB_ACTION_PATH/script.sh ${{ github.event_name }} ${{ inputs.keyword }}
21+
shell: bash
22+
- name: show detection result
23+
run: |
24+
echo "::group::final summary"
25+
echo "commit message: ${{ steps.detect-trigger.outputs.COMMIT_MESSAGE }}"
26+
echo "trigger keyword: ${{ inputs.keyword }}"
27+
echo "trigger found: ${{ steps.detect-trigger.outputs.CI_TRIGGERED }}"
28+
echo "::endgroup::"
29+
shell: bash
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
#!/usr/bin/env bash
2+
event_name="$1"
3+
keyword="$2"
4+
5+
echo "::group::fetch a sufficient number of commits"
6+
echo "skipped"
7+
# git log -n 5 2>&1
8+
# if [[ "$event_name" == "pull_request" ]]; then
9+
# ref=$(git log -1 --format='%H')
10+
# git -c protocol.version=2 fetch --deepen=2 --no-tags --prune --progress -q origin $ref 2>&1
11+
# git log FETCH_HEAD
12+
# git checkout FETCH_HEAD
13+
# else
14+
# echo "nothing to do."
15+
# fi
16+
# git log -n 5 2>&1
17+
echo "::endgroup::"
18+
19+
echo "::group::extracting the commit message"
20+
echo "event name: $event_name"
21+
if [[ "$event_name" == "pull_request" ]]; then
22+
ref="HEAD^2"
23+
else
24+
ref="HEAD"
25+
fi
26+
27+
commit_message="$(git log -n 1 --pretty=format:%s "$ref")"
28+
29+
if [[ $(echo $commit_message | wc -l) -le 1 ]]; then
30+
echo "commit message: '$commit_message'"
31+
else
32+
echo -e "commit message:\n--- start ---\n$commit_message\n--- end ---"
33+
fi
34+
echo "::endgroup::"
35+
36+
echo "::group::scanning for the keyword"
37+
echo "searching for: '$keyword'"
38+
if echo "$commit_message" | grep -qF "$keyword"; then
39+
result="true"
40+
else
41+
result="false"
42+
fi
43+
echo "keyword detected: $result"
44+
echo "::endgroup::"
45+
46+
echo "::set-output name=COMMIT_MESSAGE::$commit_message"
47+
echo "::set-output name=CI_TRIGGERED::$result"

.github/stale.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,4 @@ limitPerRun: 1 # start with a small number
5656

5757
# issues:
5858
# exemptLabels:
59-
# - confirmed
59+
# - confirmed

0 commit comments

Comments
 (0)