Skip to content

Commit c8065d2

Browse files
authored
Merge pull request #393 from blue-yonder/pyarrow13
Support pyarrow=13
2 parents d121945 + bce3ab6 commit c8065d2

File tree

7 files changed

+48
-6
lines changed

7 files changed

+48
-6
lines changed

.github/workflows/ci.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ jobs:
5151
- +test-python3.11-arrow10.x.x
5252
- +test-python3.11-arrow11.x.x
5353
- +test-python3.11-arrow12.x.x
54+
- +test-python3.11-arrow13.x.x
5455
experimental: [ false ]
5556
upload: [ false ]
5657
include:
@@ -60,7 +61,7 @@ jobs:
6061
- target: +test-python3.10-arrow12.x.x
6162
experimental: false
6263
upload: true
63-
- target: +test-python3.11-arrow12.x.x
64+
- target: +test-python3.11-arrow13.x.x
6465
experimental: false
6566
upload: true
6667
- target: +test-python3.9-arrow-nightly

.github/workflows/conda.yml

+6
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ jobs:
2929
PYARROW_VERSION: "9.0.0"
3030
- PYTHON_VERSION: "3.11"
3131
PYARROW_VERSION: "12.0.0"
32+
- PYTHON_VERSION: "3.11"
33+
PYARROW_VERSION: "13.0.0"
3234
steps:
3335
- name: Checkout branch
3436
uses: actions/checkout@v3
@@ -79,6 +81,10 @@ jobs:
7981
PYARROW_VERSION: "9.0.0"
8082
- PYTHON_VERSION: "3.11"
8183
PYARROW_VERSION: "11.0.0"
84+
- PYTHON_VERSION: "3.11"
85+
PYARROW_VERSION: "12.0.0"
86+
- PYTHON_VERSION: "3.11"
87+
PYARROW_VERSION: "13.0.0"
8288
steps:
8389
- name: Checkout branch
8490
uses: actions/checkout@v3

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.7.0
7+
-------------
8+
9+
* Support ``pyarrow=13``
10+
611
Version 4.6.0
712
--------------
813

Earthfile

+30
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,15 @@ test-python3.9-arrow12.x.x:
185185

186186
SAVE ARTIFACT /result AS LOCAL result
187187

188+
test-python3.9-arrow13.x.x:
189+
ARG PYTHON_VERSION="3.9.10"
190+
COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
191+
--build-arg ARROW_VERSION_RULE=">=13,<14" \
192+
--build-arg NUMPY_VERSION_RULE=">=1.21.2" \
193+
+test/result /result
194+
195+
SAVE ARTIFACT /result AS LOCAL result
196+
188197
test-python3.9-arrow-nightly:
189198
ARG PYTHON_VERSION="3.9.10"
190199
COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
@@ -248,6 +257,15 @@ test-python3.10-arrow12.x.x:
248257

249258
SAVE ARTIFACT /result AS LOCAL result
250259

260+
test-python3.10-arrow13.x.x:
261+
ARG PYTHON_VERSION="3.10.2"
262+
COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
263+
--build-arg ARROW_VERSION_RULE=">=13,<14" \
264+
--build-arg NUMPY_VERSION_RULE=">=1.21.2" \
265+
+test/result /result
266+
267+
SAVE ARTIFACT /result AS LOCAL result
268+
251269
test-python3.10-arrow-nightly:
252270
ARG PYTHON_VERSION="3.10.2"
253271
COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
@@ -311,6 +329,15 @@ test-python3.11-arrow12.x.x:
311329

312330
SAVE ARTIFACT /result AS LOCAL result
313331

332+
test-python3.11-arrow13.x.x:
333+
ARG PYTHON_VERSION="3.11.3"
334+
COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
335+
--build-arg ARROW_VERSION_RULE=">=13,<14" \
336+
--build-arg NUMPY_VERSION_RULE=">=1.23.3" \
337+
+test/result /result
338+
339+
SAVE ARTIFACT /result AS LOCAL result
340+
314341
test-python3.11-arrow-nightly:
315342
ARG PYTHON_VERSION="3.11.3"
316343
COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
@@ -327,6 +354,7 @@ test-python3.9-all:
327354
BUILD test-python3.9-arrow10.x.x
328355
BUILD test-python3.9-arrow11.x.x
329356
BUILD test-python3.9-arrow12.x.x
357+
BUILD test-python3.9-arrow13.x.x
330358
BUILD test-python3.9-arrow-nightly
331359

332360
test-python3.10-all:
@@ -335,6 +363,7 @@ test-python3.10-all:
335363
BUILD test-python3.10-arrow9.x.x
336364
BUILD test-python3.10-arrow11.x.x
337365
BUILD test-python3.10-arrow12.x.x
366+
BUILD test-python3.10-arrow13.x.x
338367
BUILD test-python3.10-arrow-nightly
339368

340369
test-python3.11-all:
@@ -344,6 +373,7 @@ test-python3.11-all:
344373
BUILD test-python3.11-arrow10.x.x
345374
BUILD test-python3.11-arrow11.x.x
346375
BUILD test-python3.11-arrow12.x.x
376+
BUILD test-python3.11-arrow13.x.x
347377
BUILD test-python3.11-arrow-nightly
348378

349379
test-all:

earthly/odbc/odbcinst.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ Threading = 2
1010

1111
[ODBC Driver 17 for SQL Server]
1212
Description = Microsoft ODBC Driver 17 for SQL Server
13-
Driver = /opt/microsoft/msodbcsql17/lib64/libmsodbcsql-17.10.so.2.1
13+
Driver = /opt/microsoft/msodbcsql17/lib64/libmsodbcsql-17.10.so.4.1

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.9
6-
- pyarrow>=7.0,<13
6+
- pyarrow>=7.0,<14
77
- sel(unix): unixodbc
88
- c-compiler
99
- cxx-compiler

setup.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ def get_extension_modules():
255255

256256
setup(
257257
name="turbodbc",
258-
version="4.6.0",
258+
version="4.7.0",
259259
description="turbodbc is a Python DB API 2.0 compatible ODBC driver",
260260
long_description=long_description,
261261
long_description_content_type="text/markdown",
@@ -266,11 +266,11 @@ def get_extension_modules():
266266
packages=["turbodbc"],
267267
setup_requires=[
268268
"pybind11>=2.10.4",
269-
"pyarrow>=7,<13",
269+
"pyarrow>=7,<14",
270270
"numpy>=1.20",
271271
],
272272
install_requires=[],
273-
extras_require={"arrow": ["pyarrow>=7.0,<13"], "numpy": "numpy>=1.20.0"},
273+
extras_require={"arrow": ["pyarrow>=7.0,<14"], "numpy": "numpy>=1.20.0"},
274274
python_requires=">=3.9",
275275
classifiers=[
276276
"Development Status :: 5 - Production/Stable",

0 commit comments

Comments
 (0)