Merge pull request #393 from blue-yonder/pyarrow13

Support pyarrow=13
blue-yonder · Aug 30, 2023 · c8065d2 · c8065d2
2 parents d121945 + bce3ab6
commit c8065d2
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -51,6 +51,7 @@ jobs:
           - +test-python3.11-arrow10.x.x
           - +test-python3.11-arrow11.x.x
           - +test-python3.11-arrow12.x.x
+          - +test-python3.11-arrow13.x.x
         experimental: [ false ]
         upload: [ false ]
         include:
@@ -60,7 +61,7 @@ jobs:
           - target: +test-python3.10-arrow12.x.x
             experimental: false
             upload: true
-          - target: +test-python3.11-arrow12.x.x
+          - target: +test-python3.11-arrow13.x.x
             experimental: false
             upload: true
           - target: +test-python3.9-arrow-nightly

diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
@@ -29,6 +29,8 @@ jobs:
             PYARROW_VERSION: "9.0.0"
           - PYTHON_VERSION: "3.11"
             PYARROW_VERSION: "12.0.0"
+          - PYTHON_VERSION: "3.11"
+            PYARROW_VERSION: "13.0.0"
     steps:
       - name: Checkout branch
         uses: actions/checkout@v3
@@ -79,6 +81,10 @@ jobs:
             PYARROW_VERSION: "9.0.0"
           - PYTHON_VERSION: "3.11"
             PYARROW_VERSION: "11.0.0"
+          - PYTHON_VERSION: "3.11"
+            PYARROW_VERSION: "12.0.0"
+          - PYTHON_VERSION: "3.11"
+            PYARROW_VERSION: "13.0.0"
     steps:
       - name: Checkout branch
         uses: actions/checkout@v3

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -3,6 +3,11 @@ Version history / changelog
 
 From version 2.0.0, turbodbc adapts semantic versioning.
 
+Version 4.7.0
+-------------
+
+* Support ``pyarrow=13``
+
 Version 4.6.0
 --------------
 

diff --git a/Earthfile b/Earthfile
@@ -185,6 +185,15 @@ test-python3.9-arrow12.x.x:
 
     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-arrow-nightly:
     ARG PYTHON_VERSION="3.9.10"
     COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
@@ -248,6 +257,15 @@ test-python3.10-arrow12.x.x:
 
     SAVE ARTIFACT /result AS LOCAL result
 
+test-python3.10-arrow13.x.x:
+    ARG PYTHON_VERSION="3.10.2"
+    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.10-arrow-nightly:
     ARG PYTHON_VERSION="3.10.2"
     COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
@@ -311,6 +329,15 @@ test-python3.11-arrow12.x.x:
 
     SAVE ARTIFACT /result AS LOCAL result
 
+test-python3.11-arrow13.x.x:
+    ARG PYTHON_VERSION="3.11.3"
+    COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
+        --build-arg ARROW_VERSION_RULE=">=13,<14" \
+        --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" \
@@ -327,6 +354,7 @@ test-python3.9-all:
     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-arrow-nightly
 
 test-python3.10-all:
@@ -335,6 +363,7 @@ test-python3.10-all:
     BUILD test-python3.10-arrow9.x.x
     BUILD test-python3.10-arrow11.x.x
     BUILD test-python3.10-arrow12.x.x
+    BUILD test-python3.10-arrow13.x.x
     BUILD test-python3.10-arrow-nightly
 
 test-python3.11-all:
@@ -344,6 +373,7 @@ test-python3.11-all:
     BUILD test-python3.11-arrow10.x.x
     BUILD test-python3.11-arrow11.x.x
     BUILD test-python3.11-arrow12.x.x
+    BUILD test-python3.11-arrow13.x.x
     BUILD test-python3.11-arrow-nightly
 
 test-all:

diff --git a/earthly/odbc/odbcinst.ini b/earthly/odbc/odbcinst.ini
@@ -10,4 +10,4 @@ Threading   = 2
 
 [ODBC Driver 17 for SQL Server]
 Description = Microsoft ODBC Driver 17 for SQL Server
-Driver      = /opt/microsoft/msodbcsql17/lib64/libmsodbcsql-17.10.so.2.1
+Driver      = /opt/microsoft/msodbcsql17/lib64/libmsodbcsql-17.10.so.4.1
diff --git a/environment.yml b/environment.yml
@@ -3,7 +3,7 @@ channels:
   - conda-forge
 dependencies:
   - python>=3.9
-  - pyarrow>=7.0,<13
+  - pyarrow>=7.0,<14
   - sel(unix): unixodbc
   - c-compiler
   - cxx-compiler

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