Skip to content

Commit 93b45e3

Browse files
authored
Merge pull request #383 from blue-yonder/arrow-11
Add support for pyarrow=11
2 parents 0d54577 + 6dd0a9b commit 93b45e3

File tree

7 files changed

+50
-7
lines changed

7 files changed

+50
-7
lines changed

.github/workflows/.condarc

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
experimental_sat_error_message: true
2+
repodata_use_zst: true

.github/workflows/ci.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,17 @@ jobs:
6363
- +test-python3.10-arrow8.x.x
6464
- +test-python3.10-arrow9.x.x
6565
- +test-python3.10-arrow10.x.x
66+
- +test-python3.10-arrow11.x.x
6667
experimental: [ false ]
6768
upload: [ false ]
6869
include:
69-
- target: +test-python3.8-arrow10.x.x
70+
- target: +test-python3.8-arrow11.x.x
7071
experimental: false
7172
upload: true
72-
- target: +test-python3.9-arrow10.x.x
73+
- target: +test-python3.9-arrow11.x.x
7374
experimental: false
7475
upload: true
75-
- target: +test-python3.10-arrow10.x.x
76+
- target: +test-python3.10-arrow11.x.x
7677
experimental: false
7778
upload: true
7879
- target: +test-python3.8-arrow-nightly

.github/workflows/conda.yml

+6
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ jobs:
2727
include:
2828
- PYTHON_VERSION: "3.10"
2929
PYARROW_VERSION: "9.0.0"
30+
- PYTHON_VERSION: "3.11"
31+
PYARROW_VERSION: "11.0.0"
3032
steps:
3133
- name: Checkout branch
3234
uses: actions/checkout@v3
@@ -37,6 +39,7 @@ jobs:
3739
- name: Set up Conda env
3840
uses: mamba-org/provision-with-micromamba@e2b397b12d0a38069451664382b769c9456e3d6d
3941
with:
42+
condarc-file: .github/workflows/.condarc
4043
cache-env: true
4144
extra-specs: |
4245
python=${{ matrix.PYTHON_VERSION }}
@@ -76,6 +79,8 @@ jobs:
7679
PYARROW_VERSION: "8.0.0"
7780
- PYTHON_VERSION: "3.10"
7881
PYARROW_VERSION: "9.0.0"
82+
- PYTHON_VERSION: "3.11"
83+
PYARROW_VERSION: "11.0.0"
7984
steps:
8085
- name: Checkout branch
8186
uses: actions/checkout@v3
@@ -86,6 +91,7 @@ jobs:
8691
- name: Set up Conda env
8792
uses: mamba-org/provision-with-micromamba@e2b397b12d0a38069451664382b769c9456e3d6d
8893
with:
94+
condarc-file: .github/workflows/.condarc
8995
cache-env: true
9096
extra-specs: |
9197
python=${{ matrix.PYTHON_VERSION }}

CHANGELOG.rst

+5
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ Version history / changelog
33

44
From version 2.0.0, turbodbc adapts semantic versioning.
55

6+
Version 4.5.10
7+
--------------
8+
9+
* Support ``pyarrow=11``
10+
611
Version 4.5.9
712
-------------
813

Earthfile

+30-1
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,15 @@ test-python3.8-arrow10.x.x:
221221

222222
SAVE ARTIFACT /result AS LOCAL result
223223

224+
test-python3.8-arrow11.x.x:
225+
ARG PYTHON_VERSION="3.8.12"
226+
COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
227+
--build-arg ARROW_VERSION_RULE=">=11,<12" \
228+
--build-arg NUMPY_VERSION_RULE=">=1.20.0" \
229+
+test/result /result
230+
231+
SAVE ARTIFACT /result AS LOCAL result
232+
224233
test-python3.8-arrow-nightly:
225234
ARG PYTHON_VERSION="3.8.12"
226235
COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
@@ -320,6 +329,15 @@ test-python3.9-arrow10.x.x:
320329

321330
SAVE ARTIFACT /result AS LOCAL result
322331

332+
test-python3.9-arrow11.x.x:
333+
ARG PYTHON_VERSION="3.9.10"
334+
COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
335+
--build-arg ARROW_VERSION_RULE=">=11,<12" \
336+
--build-arg NUMPY_VERSION_RULE=">=1.20.0" \
337+
+test/result /result
338+
339+
SAVE ARTIFACT /result AS LOCAL result
340+
323341
test-python3.9-arrow-nightly:
324342
ARG PYTHON_VERSION="3.9.10"
325343
COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
@@ -419,6 +437,15 @@ test-python3.10-arrow10.x.x:
419437

420438
SAVE ARTIFACT /result AS LOCAL result
421439

440+
test-python3.10-arrow11.x.x:
441+
ARG PYTHON_VERSION="3.10.2"
442+
COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
443+
--build-arg ARROW_VERSION_RULE=">=11,<12" \
444+
--build-arg NUMPY_VERSION_RULE=">=1.21.2" \
445+
+test/result /result
446+
447+
SAVE ARTIFACT /result AS LOCAL result
448+
422449
test-python3.10-arrow-nightly:
423450
ARG PYTHON_VERSION="3.10.2"
424451
COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
@@ -439,6 +466,7 @@ test-python3.8-all:
439466
BUILD test-python3.8-arrow8.x.x
440467
BUILD test-python3.8-arrow9.x.x
441468
BUILD test-python3.8-arrow10.x.x
469+
BUILD test-python3.8-arrow11.x.x
442470
BUILD test-python3.8-arrow-nightly
443471

444472
test-python3.9-all:
@@ -452,6 +480,7 @@ test-python3.9-all:
452480
BUILD test-python3.9-arrow8.x.x
453481
BUILD test-python3.9-arrow9.x.x
454482
BUILD test-python3.9-arrow10.x.x
483+
BUILD test-python3.9-arrow11.x.x
455484
BUILD test-python3.9-arrow-nightly
456485

457486
test-python3.10-all:
@@ -464,7 +493,7 @@ test-python3.10-all:
464493
BUILD test-python3.10-arrow7.x.x
465494
BUILD test-python3.10-arrow8.x.x
466495
BUILD test-python3.10-arrow9.x.x
467-
BUILD test-python3.10-arrow10.x.x
496+
BUILD test-python3.10-arrow11.x.x
468497
BUILD test-python3.10-arrow-nightly
469498

470499
test-all:

environment.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ channels:
33
- conda-forge
44
dependencies:
55
- python>=3.8
6-
- pyarrow>=1.0,<11
6+
- pyarrow>=1.0,<12
77
- sel(unix): unixodbc
88
- c-compiler
99
- cxx-compiler

setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ def get_extension_modules():
254254

255255
setup(
256256
name="turbodbc",
257-
version="4.5.9",
257+
version="4.5.10",
258258
description="turbodbc is a Python DB API 2.0 compatible ODBC driver",
259259
long_description=long_description,
260260
long_description_content_type="text/markdown",
@@ -265,7 +265,7 @@ def get_extension_modules():
265265
packages=["turbodbc"],
266266
setup_requires=[
267267
"pybind11>=2.2.0",
268-
"pyarrow>=1,<11",
268+
"pyarrow>=1,<12",
269269
"numpy>=1.18",
270270
],
271271
install_requires=[],

0 commit comments

Comments
 (0)