Skip to content

Commit cc22e57

Browse files
authored
Backport PR #43772: CI: Test Python 3.10 on MacOS and Windows too (#43935)
1 parent c5b24da commit cc22e57

File tree

2 files changed

+24
-9
lines changed

2 files changed

+24
-9
lines changed

.github/workflows/python-dev.yml

+21-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,22 @@ env:
2121

2222
jobs:
2323
build:
24-
runs-on: ubuntu-latest
24+
runs-on: ${{ matrix.os }}
25+
strategy:
26+
fail-fast: false
27+
matrix:
28+
os: [ubuntu-latest, macOS-latest, windows-latest]
29+
2530
name: actions-310-dev
2631
timeout-minutes: 60
2732

33+
env:
34+
NUMPY_WHEELS_AVAILABLE: ${{ matrix.os == 'ubuntu-latest' }}
35+
36+
concurrency:
37+
group: ${{ github.ref }}-${{ matrix.os }}-dev
38+
cancel-in-progress: ${{github.event_name == 'pull_request'}}
39+
2840
steps:
2941
- uses: actions/checkout@v2
3042
with:
@@ -36,12 +48,16 @@ jobs:
3648
python-version: '3.10-dev'
3749

3850
- name: Install dependencies
51+
shell: bash
3952
run: |
4053
python -m pip install --upgrade pip setuptools wheel
41-
pip install -i https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy
42-
pip install git+https://github.com/pytest-dev/pytest.git
54+
if [[ "$NUMPY_WHEELS_AVAILABLE" == "true" ]]; then
55+
pip install -i https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy
56+
else
57+
pip install git+https://github.com/numpy/numpy.git
58+
fi
4359
pip install git+https://github.com/nedbat/coveragepy.git
44-
pip install cython python-dateutil pytz hypothesis pytest-xdist pytest-cov
60+
pip install cython python-dateutil pytz hypothesis pytest>=6.2.5 pytest-xdist pytest-cov
4561
pip list
4662
4763
- name: Build Pandas
@@ -54,6 +70,7 @@ jobs:
5470
python -c "import pandas; pandas.show_versions();"
5571
5672
- name: Test with pytest
73+
shell: bash
5774
run: |
5875
ci/run_tests.sh
5976
# GH 41935

pandas/tests/frame/test_reductions.py

+3-5
Original file line numberDiff line numberDiff line change
@@ -1366,11 +1366,9 @@ def test_min_max_dt64_with_NaT_skipna_false(self, request, tz_naive_fixture):
13661366
# GH#36907
13671367
tz = tz_naive_fixture
13681368
if isinstance(tz, tzlocal) and is_platform_windows():
1369-
request.node.add_marker(
1370-
pytest.mark.xfail(
1371-
reason="GH#37659 OSError raised within tzlocal bc Windows "
1372-
"chokes in times before 1970-01-01"
1373-
)
1369+
pytest.skip(
1370+
"GH#37659 OSError raised within tzlocal bc Windows "
1371+
"chokes in times before 1970-01-01"
13741372
)
13751373

13761374
df = DataFrame(

0 commit comments

Comments
 (0)