Skip to content

Commit 4878dfe

Browse files
authored
CI: Unpin pyarrow<10 (#50314)
* CI: Unpin pyarrow<10 * Skip test
1 parent 9918c84 commit 4878dfe

File tree

12 files changed

+15
-10
lines changed

12 files changed

+15
-10
lines changed

.github/actions/setup-conda/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ runs:
1818
- name: Set Arrow version in ${{ inputs.environment-file }} to ${{ inputs.pyarrow-version }}
1919
run: |
2020
grep -q ' - pyarrow' ${{ inputs.environment-file }}
21-
sed -i"" -e "s/ - pyarrow<10/ - pyarrow=${{ inputs.pyarrow-version }}/" ${{ inputs.environment-file }}
21+
sed -i"" -e "s/ - pyarrow/ - pyarrow=${{ inputs.pyarrow-version }}/" ${{ inputs.environment-file }}
2222
cat ${{ inputs.environment-file }}
2323
shell: bash
2424
if: ${{ inputs.pyarrow-version }}

.github/workflows/ubuntu.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
matrix:
3030
env_file: [actions-38.yaml, actions-39.yaml, actions-310.yaml]
3131
pattern: ["not single_cpu", "single_cpu"]
32-
pyarrow_version: ["7", "8", "9"]
32+
pyarrow_version: ["7", "8", "9", "10"]
3333
include:
3434
- name: "Downstream Compat"
3535
env_file: actions-38-downstream_compat.yaml

ci/deps/actions-310.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ dependencies:
4242
- psycopg2
4343
- pymysql
4444
- pytables
45-
- pyarrow<10
45+
- pyarrow
4646
- pyreadstat
4747
- python-snappy
4848
- pyxlsb

ci/deps/actions-38-downstream_compat.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ dependencies:
4040
- openpyxl
4141
- odfpy
4242
- psycopg2
43-
- pyarrow<10
43+
- pyarrow
4444
- pymysql
4545
- pyreadstat
4646
- pytables

ci/deps/actions-38.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ dependencies:
4040
- odfpy
4141
- pandas-gbq
4242
- psycopg2
43-
- pyarrow<10
43+
- pyarrow
4444
- pymysql
4545
- pyreadstat
4646
- pytables

ci/deps/actions-39.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ dependencies:
4141
- pandas-gbq
4242
- psycopg2
4343
- pymysql
44-
- pyarrow<10
44+
- pyarrow
4545
- pyreadstat
4646
- pytables
4747
- python-snappy

ci/deps/circle-38-arm64.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ dependencies:
4040
- odfpy
4141
- pandas-gbq
4242
- psycopg2
43-
- pyarrow<10
43+
- pyarrow
4444
- pymysql
4545
# Not provided on ARM
4646
#- pyreadstat

environment.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ dependencies:
4343
- odfpy
4444
- py
4545
- psycopg2
46-
- pyarrow<10
46+
- pyarrow
4747
- pymysql
4848
- pyreadstat
4949
- pytables

pandas/compat/pyarrow.py

+2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@
1313
pa_version_under7p0 = _palv < Version("7.0.0")
1414
pa_version_under8p0 = _palv < Version("8.0.0")
1515
pa_version_under9p0 = _palv < Version("9.0.0")
16+
pa_version_under10p0 = _palv < Version("10.0.0")
1617
except ImportError:
1718
pa_version_under6p0 = True
1819
pa_version_under7p0 = True
1920
pa_version_under8p0 = True
2021
pa_version_under9p0 = True
22+
pa_version_under10p0 = True

pandas/tests/arrays/interval/test_interval.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ def test_arrow_array():
287287
with pytest.raises(TypeError, match="Not supported to convert IntervalArray"):
288288
pa.array(intervals, type="float64")
289289

290-
with pytest.raises(TypeError, match="different 'subtype'"):
290+
with pytest.raises(TypeError, match="different 'subtype'|to convert IntervalArray"):
291291
pa.array(intervals, type=ArrowIntervalType(pa.float64(), "left"))
292292

293293

pandas/tests/arrays/period/test_arrow_compat.py

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import pytest
22

3+
from pandas.compat.pyarrow import pa_version_under10p0
4+
35
from pandas.core.dtypes.dtypes import PeriodDtype
46

57
import pandas as pd
@@ -26,6 +28,7 @@ def test_arrow_extension_type():
2628
assert hash(p1) != hash(p3)
2729

2830

31+
@pytest.mark.xfail(not pa_version_under10p0, reason="Wrong behavior with pyarrow 10")
2932
@pytest.mark.parametrize(
3033
"data, freq",
3134
[

requirements-dev.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ openpyxl
3232
odfpy
3333
py
3434
psycopg2-binary
35-
pyarrow<10
35+
pyarrow
3636
pymysql
3737
pyreadstat
3838
tables

0 commit comments

Comments
 (0)