Merge pull request #426 from blue-yonder/arrow16

Build and test with pyarrow 16

.github/workflows/ci.yml

@@ -18,10 +18,10 @@ jobs:
     steps:
       - name: Checkout branch
         uses: actions/checkout@v4
-      - name: Install Python 3.9
+      - name: Install Python 3.11
         uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: 3.11
       - name: Run pre-commit checks
         uses: pre-commit/[email protected]
 
@@ -33,12 +33,6 @@ jobs:
       fail-fast: false
       matrix:
         target:
-          - +test-python3.9-arrow7.x.x
-          - +test-python3.9-arrow8.x.x
-          - +test-python3.9-arrow9.x.x
-          - +test-python3.9-arrow10.x.x
-          - +test-python3.9-arrow11.x.x
-          - +test-python3.9-arrow12.x.x
           - +test-python3.10-arrow7.x.x
           - +test-python3.10-arrow8.x.x
           - +test-python3.10-arrow9.x.x
@@ -54,10 +48,11 @@ jobs:
           - +test-python3.11-arrow13.x.x
           - +test-python3.11-arrow14.x.x
           - +test-python3.11-arrow15.x.x
+          - +test-python3.11-arrow16.x.x
         experimental: [ false ]
         upload: [false]
         include:
-          - target: +test-python3.9-arrow12.x.x
+          - target: +test-python3.10-arrow12.x.x
             experimental: false
             upload: false
           - target: +test-python3.10-arrow12.x.x
@@ -69,9 +64,6 @@ jobs:
           - target: +test-python3.11-arrow15.x.x
             experimental: false
             upload: true
-          - target: +test-python3.9-arrow-nightly
-            experimental: true
-            upload: false
           - target: +test-python3.10-arrow-nightly
             experimental: true
             upload: false

.github/workflows/conda.yml

@@ -18,11 +18,11 @@ defaults:
 
 jobs:
   macos-tests:
-    runs-on: macos-latest
+    runs-on: macos-13
     strategy:
       fail-fast: false
       matrix:
-        PYTHON_VERSION: ['3.9', '3.10', '3.11']
+        PYTHON_VERSION: ['3.10', '3.11']
         PYARROW_VERSION: ['10.0.1']
         include:
           - PYTHON_VERSION: "3.10"
@@ -35,6 +35,8 @@ jobs:
             PYARROW_VERSION: "14.0.1"
           - PYTHON_VERSION: "3.11"
             PYARROW_VERSION: "15.0.0"
+          - PYTHON_VERSION: "3.11"
+            PYARROW_VERSION: "16.0.0"
     steps:
       - name: Checkout branch
         uses: actions/checkout@v4

CHANGELOG.rst

@@ -3,6 +3,13 @@ Version history / changelog
 
 From version 2.0.0, turbodbc adapts semantic versioning.
 
+
+Version 4.12.0
+--------------
+
+* Support ``pyarrow=16``
+* Drop Python 3.9
+
 Version 4.11.1
 --------------
 

Earthfile

@@ -33,7 +33,7 @@ os-base:
     #     rm /opt/*.tar.gz
 
 python:
-    ARG PYTHON_VERSION=3.9.13
+    ARG PYTHON_VERSION=3.10.14
     ARG ARROW_VERSION_RULE="<8.0.0"
     ARG NUMPY_VERSION_RULE=""
     ARG CONDA_EXTRA=""
@@ -68,7 +68,7 @@ python:
         tar xvf v2.9.1.tar.gz
 
 build:
-    ARG PYTHON_VERSION=3.9.13
+    ARG PYTHON_VERSION=3.10.14
     ARG ARROW_VERSION_RULE="<8.0.0"
     ARG NUMPY_VERSION_RULE=""
     ARG CONDA_EXTRA=""
@@ -100,7 +100,7 @@ build:
     SAVE ARTIFACT /src/build/dist/dist /dist
 
 test:
-    ARG PYTHON_VERSION=3.9.13
+    ARG PYTHON_VERSION=3.10.14
     ARG ARROW_VERSION_RULE=""
     ARG NUMPY_VERSION_RULE=""
     ARG CONDA_EXTRA=""
@@ -132,96 +132,6 @@ test:
     SAVE ARTIFACT ../gcov /result/cov/cpp
     SAVE ARTIFACT /src/build/dist/dist /result/dist
 
-test-python3.9-arrow7.x.x:
-    ARG PYTHON_VERSION="3.9.10"
-    COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
-        --build-arg ARROW_VERSION_RULE=">=7,<8" \
-        --build-arg NUMPY_VERSION_RULE=">=1.20.0" \
-        +test/result /result
-
-    SAVE ARTIFACT /result AS LOCAL result
-
-test-python3.9-arrow8.x.x:
-    ARG PYTHON_VERSION="3.9.10"
-    COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
-        --build-arg ARROW_VERSION_RULE=">=8,<9" \
-        --build-arg NUMPY_VERSION_RULE=">=1.20.0" \
-        +test/result /result
-
-    SAVE ARTIFACT /result AS LOCAL result
-
-test-python3.9-arrow9.x.x:
-    ARG PYTHON_VERSION="3.9.10"
-    COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
-        --build-arg ARROW_VERSION_RULE=">=9,<10" \
-        --build-arg NUMPY_VERSION_RULE=">=1.20.0" \
-        +test/result /result
-
-    SAVE ARTIFACT /result AS LOCAL result
-
-test-python3.9-arrow10.x.x:
-    ARG PYTHON_VERSION="3.9.10"
-    COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
-        --build-arg ARROW_VERSION_RULE=">=10,<11" \
-        --build-arg NUMPY_VERSION_RULE=">=1.20.0" \
-        +test/result /result
-
-    SAVE ARTIFACT /result AS LOCAL result
-
-test-python3.9-arrow11.x.x:
-    ARG PYTHON_VERSION="3.9.10"
-    COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
-        --build-arg ARROW_VERSION_RULE=">=11,<12" \
-        --build-arg NUMPY_VERSION_RULE=">=1.20.0" \
-        +test/result /result
-
-    SAVE ARTIFACT /result AS LOCAL result
-
-test-python3.9-arrow12.x.x:
-    ARG PYTHON_VERSION="3.9.10"
-    COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
-        --build-arg ARROW_VERSION_RULE=">=12,<13" \
-        --build-arg NUMPY_VERSION_RULE=">=1.21.2" \
-        +test/result /result
-
-    SAVE ARTIFACT /result AS LOCAL result
-
-test-python3.9-arrow13.x.x:
-    ARG PYTHON_VERSION="3.9.10"
-    COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
-        --build-arg ARROW_VERSION_RULE=">=13,<14" \
-        --build-arg NUMPY_VERSION_RULE=">=1.21.2" \
-        +test/result /result
-
-    SAVE ARTIFACT /result AS LOCAL result
-
-test-python3.9-arrow14.x.x:
-    ARG PYTHON_VERSION="3.9.10"
-    COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
-        --build-arg ARROW_VERSION_RULE=">=14,<15" \
-        --build-arg NUMPY_VERSION_RULE=">=1.21.2" \
-        +test/result /result
-
-    SAVE ARTIFACT /result AS LOCAL result
-
-test-python3.9-arrow15.x.x:
-    ARG PYTHON_VERSION="3.9.10"
-    COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
-        --build-arg ARROW_VERSION_RULE=">=15,<16" \
-        --build-arg NUMPY_VERSION_RULE=">=1.21.2" \
-        +test/result /result
-
-    SAVE ARTIFACT /result AS LOCAL result
-
-test-python3.9-arrow-nightly:
-    ARG PYTHON_VERSION="3.9.10"
-    COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
-        --build-arg NUMPY_VERSION_RULE=">=1.20.0" \
-        --build-arg CONDA_EXTRA="-c arrow-nightlies" \
-        +test/result /result
-
-    SAVE ARTIFACT /result AS LOCAL result/$EARTHLY_TARGET_NAME
-
 test-python3.10-arrow7.x.x:
     ARG PYTHON_VERSION="3.10.2"
     COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
@@ -393,6 +303,15 @@ test-python3.11-arrow15.x.x:
 
     SAVE ARTIFACT /result AS LOCAL result
 
+test-python3.11-arrow16.x.x:
+    ARG PYTHON_VERSION="3.11.3"
+    COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
+        --build-arg ARROW_VERSION_RULE=">=16,<17" \
+        --build-arg NUMPY_VERSION_RULE=">=1.23.3" \
+        +test/result /result
+
+    SAVE ARTIFACT /result AS LOCAL result
+
 test-python3.11-arrow-nightly:
     ARG PYTHON_VERSION="3.11.3"
     COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
@@ -402,18 +321,6 @@ test-python3.11-arrow-nightly:
 
     SAVE ARTIFACT /result AS LOCAL result/$EARTHLY_TARGET_NAME
 
-test-python3.9-all:
-    BUILD test-python3.9-arrow7.x.x
-    BUILD test-python3.9-arrow8.x.x
-    BUILD test-python3.9-arrow9.x.x
-    BUILD test-python3.9-arrow10.x.x
-    BUILD test-python3.9-arrow11.x.x
-    BUILD test-python3.9-arrow12.x.x
-    BUILD test-python3.9-arrow13.x.x
-    BUILD test-python3.9-arrow14.x.x
-    BUILD test-python3.9-arrow15.x.x
-    BUILD test-python3.9-arrow-nightly
-
 test-python3.10-all:
     BUILD test-python3.10-arrow7.x.x
     BUILD test-python3.10-arrow8.x.x
@@ -423,6 +330,7 @@ test-python3.10-all:
     BUILD test-python3.10-arrow13.x.x
     BUILD test-python3.10-arrow14.x.x
     BUILD test-python3.10-arrow15.x.x
+    BUILD test-python3.10-arrow16.x.x
     BUILD test-python3.10-arrow-nightly
 
 test-python3.11-all:
@@ -435,15 +343,15 @@ test-python3.11-all:
     BUILD test-python3.11-arrow13.x.x
     BUILD test-python3.11-arrow14.x.x
     BUILD test-python3.11-arrow15.x.x
+    BUILD test-python3.11-arrow16.x.x
     BUILD test-python3.11-arrow-nightly
 
 test-all:
-    BUILD +test-python3.9-all
     BUILD +test-python3.10-all
     BUILD +test-python3.11-all
 
 docker:
-    ARG PYTHON_VERSION=3.9.13
+    ARG PYTHON_VERSION=3.10.14
     ARG ARROW_VERSION_RULE="<8.0.0"
     ARG NUMPY_VERSION_RULE="<1.21.0"
 

environment.yml

@@ -2,8 +2,8 @@ name: turbodbc
 channels:
   - conda-forge
 dependencies:
-  - python>=3.9
-  - pyarrow>=7.0,<16
+  - python>=3.10
+  - pyarrow>=7.0,<17
   - sel(unix): unixodbc
   - c-compiler
   - cxx-compiler

setup.py

@@ -259,7 +259,7 @@ def get_extension_modules():
 
 setup(
     name="turbodbc",
-    version="4.11.1",
+    version="4.12.0",
     description="turbodbc is a Python DB API 2.0 compatible ODBC driver",
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -270,12 +270,12 @@ def get_extension_modules():
     packages=["turbodbc"],
     setup_requires=[
         "pybind11>=2.10.4",
-        "pyarrow>=7,<16",
+        "pyarrow>=7,<17",
         "numpy>=1.20",
     ],
     install_requires=[],
-    extras_require={"arrow": ["pyarrow>=7.0,<16"], "numpy": "numpy>=1.20.0"},
-    python_requires=">=3.9",
+    extras_require={"arrow": ["pyarrow>=7.0,<17"], "numpy": "numpy>=1.20.0"},
+    python_requires=">=3.10",
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Intended Audience :: Developers",