Skip to content

Commit 6d2a730

Browse files
authored
fix the upstream-dev CI (#5343)
* try to get the upstream-dev back to run on scheduled events * [test-upstream] * [skip-ci] [test-upstream] * [skip-ci] * xfail the failing CFTimeIndex tests with nc-time-axis installed * [test-upstream]
1 parent f3794ab commit 6d2a730

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

.github/workflows/upstream-dev-ci.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,11 @@ jobs:
3333
runs-on: ubuntu-latest
3434
needs: detect-ci-trigger
3535
if: |
36-
(github.event_name == 'schedule' || github.event_name == 'workflow_dispatch')
37-
|| needs.detect-ci-trigger.outputs.triggered == 'true'
36+
always()
37+
&& (
38+
(github.event_name == 'schedule' || github.event_name == 'workflow_dispatch')
39+
|| needs.detect-ci-trigger.outputs.triggered == 'true'
40+
)
3841
defaults:
3942
run:
4043
shell: bash -l {0}

xarray/tests/test_plot.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2580,6 +2580,7 @@ def test_datetime_line_plot(self):
25802580
self.darray.plot.line()
25812581

25822582

2583+
@pytest.mark.xfail(reason="recent versions of nc-time-axis and cftime are incompatible")
25832584
@pytest.mark.filterwarnings("ignore:setting an array element with a sequence")
25842585
@requires_nc_time_axis
25852586
@requires_cftime

0 commit comments

Comments
 (0)