Merge pull request #414 from rupurt/arrow-15

support arrow 15.x
blue-yonder · Feb 7, 2024 · b5be1df · b5be1df
2 parents 13f5b8a + 40a0ce0
commit b5be1df
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -53,6 +53,7 @@ jobs:
           - +test-python3.11-arrow12.x.x
           - +test-python3.11-arrow13.x.x
           - +test-python3.11-arrow14.x.x
+          - +test-python3.11-arrow15.x.x
         experimental: [ false ]
         upload: [ false ]
         include:
@@ -65,6 +66,9 @@ jobs:
           - target: +test-python3.11-arrow14.x.x
             experimental: false
             upload: true
+          - target: +test-python3.11-arrow15.x.x
+            experimental: false
+            upload: true
           - target: +test-python3.9-arrow-nightly
             experimental: true
             upload: false

diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
@@ -33,6 +33,8 @@ jobs:
             PYARROW_VERSION: "13.0.0"
           - PYTHON_VERSION: "3.11"
             PYARROW_VERSION: "14.0.1"
+          - PYTHON_VERSION: "3.11"
+            PYARROW_VERSION: "15.0.0"
     steps:
       - name: Checkout branch
         uses: actions/checkout@v4
@@ -89,6 +91,8 @@ jobs:
             PYARROW_VERSION: "13.0.0"
           - PYTHON_VERSION: "3.11"
             PYARROW_VERSION: "14.0.1"
+          - PYTHON_VERSION: "3.11"
+            PYARROW_VERSION: "15.0.0"
     steps:
       - name: Create SQL Server
         shell: pwsh

diff --git a/Earthfile b/Earthfile
@@ -204,6 +204,15 @@ test-python3.9-arrow14.x.x:
 
     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" \
@@ -285,6 +294,15 @@ test-python3.10-arrow14.x.x:
 
     SAVE ARTIFACT /result AS LOCAL result
 
+test-python3.10-arrow15.x.x:
+    ARG PYTHON_VERSION="3.10.2"
+    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.10-arrow-nightly:
     ARG PYTHON_VERSION="3.10.2"
     COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
@@ -366,6 +384,15 @@ test-python3.11-arrow14.x.x:
 
     SAVE ARTIFACT /result AS LOCAL result
 
+test-python3.11-arrow15.x.x:
+    ARG PYTHON_VERSION="3.11.3"
+    COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
+        --build-arg ARROW_VERSION_RULE=">=15,<16" \
+        --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" \
@@ -384,6 +411,7 @@ test-python3.9-all:
     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:
@@ -394,6 +422,7 @@ test-python3.10-all:
     BUILD test-python3.10-arrow12.x.x
     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-arrow-nightly
 
 test-python3.11-all:
@@ -405,6 +434,7 @@ test-python3.11-all:
     BUILD test-python3.11-arrow12.x.x
     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-arrow-nightly
 
 test-all:

diff --git a/environment.yml b/environment.yml
@@ -3,7 +3,7 @@ channels:
   - conda-forge
 dependencies:
   - python>=3.9
-  - pyarrow>=7.0,<15
+  - pyarrow>=7.0,<16
   - sel(unix): unixodbc
   - c-compiler
   - cxx-compiler

diff --git a/setup.py b/setup.py
@@ -259,7 +259,7 @@ def get_extension_modules():
 
 setup(
     name="turbodbc",
-    version="4.10.1",
+    version="4.11.0",
     description="turbodbc is a Python DB API 2.0 compatible ODBC driver",
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -270,11 +270,11 @@ def get_extension_modules():
     packages=["turbodbc"],
     setup_requires=[
         "pybind11>=2.10.4",
-        "pyarrow>=7,<15",
+        "pyarrow>=7,<16",
         "numpy>=1.20",
     ],
     install_requires=[],
-    extras_require={"arrow": ["pyarrow>=7.0,<15"], "numpy": "numpy>=1.20.0"},
+    extras_require={"arrow": ["pyarrow>=7.0,<16"], "numpy": "numpy>=1.20.0"},
     python_requires=">=3.9",
     classifiers=[
         "Development Status :: 5 - Production/Stable",