Merge pull request #360 from blue-yonder/arrow9

Enable arrow 9 builds
blue-yonder · Aug 11, 2022 · ca36325 · ca36325
2 parents ca6b42d + 4e73d0d
commit ca36325
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -41,6 +41,7 @@ jobs:
           - +test-python3.8-arrow6.x.x
           - +test-python3.8-arrow7.x.x
           - +test-python3.8-arrow8.x.x
+          - +test-python3.8-arrow9.x.x
           - +test-python3.9-arrow1.x.x
           - +test-python3.9-arrow2.x.x
           - +test-python3.9-arrow3.x.x
@@ -49,6 +50,7 @@ jobs:
           - +test-python3.9-arrow6.x.x
           - +test-python3.9-arrow7.x.x
           - +test-python3.9-arrow8.x.x
+          - +test-python3.9-arrow9.x.x
           - +test-python3.10-arrow1.x.x
           - +test-python3.10-arrow2.x.x
           - +test-python3.10-arrow3.x.x
@@ -57,16 +59,17 @@ jobs:
           - +test-python3.10-arrow6.x.x
           - +test-python3.10-arrow7.x.x
           - +test-python3.10-arrow8.x.x
+          - +test-python3.10-arrow9.x.x
         experimental: [ false ]
         upload: [ false ]
         include:
-          - target: +test-python3.8-arrow8.x.x
+          - target: +test-python3.8-arrow9.x.x
             experimental: false
             upload: true
-          - target: +test-python3.9-arrow8.x.x
+          - target: +test-python3.9-arrow9.x.x
             experimental: false
             upload: true
-          - target: +test-python3.10-arrow8.x.x
+          - target: +test-python3.10-arrow9.x.x
             experimental: false
             upload: true
           - target: +test-python3.8-arrow-nightly
@@ -106,7 +109,7 @@ jobs:
       - name: Publish package
         if: matrix.upload && github.event_name == 'push' && startsWith(github.ref, 'refs/tags') && github.repository == 'blue-yonder/turbodbc'
 
-        uses: pypa/gh-action-pypi-publish@master
+        uses: pypa/gh-action-pypi-publish@v1.5.1
         with:
           user: __token__
           password: ${{ secrets.PYPI_UPLOAD }}

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.5.5
+-------------
+
+* Update package requirements so that ``pyarrow>=1.0,<9.1`` can be used.
+
 Version 4.5.4
 -------------
 

diff --git a/Earthfile b/Earthfile
@@ -203,6 +203,15 @@ test-python3.8-arrow8.x.x:
 
     SAVE ARTIFACT /result AS LOCAL result
 
+test-python3.8-arrow9.x.x:
+    ARG PYTHON_VERSION="3.8.12"
+    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.8-arrow-nightly:
     ARG PYTHON_VERSION="3.8.12"
     COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
@@ -284,6 +293,15 @@ test-python3.9-arrow8.x.x:
 
     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-arrow-nightly:
     ARG PYTHON_VERSION="3.9.10"
     COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
@@ -365,6 +383,15 @@ test-python3.10-arrow8.x.x:
 
     SAVE ARTIFACT /result AS LOCAL result
 
+test-python3.10-arrow9.x.x:
+    ARG PYTHON_VERSION="3.10.2"
+    COPY --build-arg PYTHON_VERSION="$PYTHON_VERSION" \
+        --build-arg ARROW_VERSION_RULE=">=9,<10" \
+        --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" \
@@ -383,6 +410,7 @@ test-python3.8-all:
     BUILD test-python3.8-arrow6.x.x
     BUILD test-python3.8-arrow7.x.x
     BUILD test-python3.8-arrow8.x.x
+    BUILD test-python3.8-arrow9.x.x
     BUILD test-python3.8-arrow-nightly
 
 test-python3.9-all:
@@ -394,6 +422,7 @@ test-python3.9-all:
     BUILD test-python3.9-arrow6.x.x
     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-arrow-nightly
 
 test-python3.10-all:
@@ -405,6 +434,7 @@ test-python3.10-all:
     BUILD test-python3.10-arrow6.x.x
     BUILD test-python3.10-arrow7.x.x
     BUILD test-python3.10-arrow8.x.x
+    BUILD test-python3.10-arrow9.x.x
     BUILD test-python3.10-arrow-nightly
 
 test-all:

diff --git a/setup.py b/setup.py
@@ -219,7 +219,7 @@ def get_extension_modules():
 
 setup(
     name="turbodbc",
-    version="4.5.4",
+    version="4.5.5",
     description="turbodbc is a Python DB API 2.0 compatible ODBC driver",
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -230,11 +230,11 @@ def get_extension_modules():
     packages=["turbodbc"],
     setup_requires=[
         "pybind11>=2.2.0",
-        "pyarrow>=1,<8.1.0",
+        "pyarrow>=1,<9.1.0",
         "numpy>=1.18",
     ],
     install_requires=[],
-    extras_require={"arrow": ["pyarrow>=1.0,<8.1.0"], "numpy": "numpy>=1.19.0"},
+    extras_require={"arrow": ["pyarrow>=1.0,<9.1.0"], "numpy": "numpy>=1.19.0"},
     python_requires=">=3.8",
     classifiers=[
         "Development Status :: 5 - Production/Stable",