From 010638828b04175e5a61b8b86d015936a3d12d71 Mon Sep 17 00:00:00 2001
From: Simon Perkins <simon.perkins@gmail.com>
Date: Fri, 27 Oct 2023 09:56:01 +0200
Subject: [PATCH] Deprecate python 3.8 support and handle pyarrow 13.0.0 test
 failures (#296)

---
 .github/workflows/ci.yml | 7 +++++--
 HISTORY.rst              | 5 +++++
 pyproject.toml           | 9 +++++----
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fdf0b545..1cb6d921 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ on:
     - cron: '30 2 * * 1' # Every Monday @ 2h30am UTC
 
 env:
-  POETRY_VERSION: 1.2.1
+  POETRY_VERSION: 1.6.1
   MINIO_SERVER_DOWNLOAD_URL: https://dl.min.io/server/minio/release/linux-amd64/archive/minio_20230907020502.0.0_amd64.deb
   MINIO_CLIENT_DOWNLOAD_URL: https://dl.min.io/client/mc/release/linux-amd64/archive/mcli_20230907224855.0.0_amd64.deb
 
@@ -30,7 +30,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.9", "3.10", "3.11"]
 
     steps:
       - name: Create Cache Hash
@@ -86,6 +86,9 @@ jobs:
         with:
           fetch-depth: 1
 
+      - name: Setup a virtual environment appropriate to the python version
+        run: poetry env use python${{ matrix.python-version }}
+
       - name: Install dask-ms base
         run: poetry install --extras "testing arrow zarr"
 
diff --git a/HISTORY.rst b/HISTORY.rst
index a6bed40c..9be2cdc6 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -2,6 +2,11 @@
 History
 =======
 
+X.Y.Z (YYYY-MM-DD)
+------------------
+* Deprecate Python 3.8 support (:pr:`296`)
+* Temporarily add Pandas as an arrow extra dependency (:pr:`296`)
+
 0.2.18 (2023-09-20)
 ------------------
 * Ignore non-existent columns (:pr:`290`)
diff --git a/pyproject.toml b/pyproject.toml
index 98fc1573..403ac640 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -8,28 +8,29 @@ readme = "README.rst"
 packages = [{include = "daskms"}]
 
 [tool.poetry.dependencies]
-python = "^3.8"
+python = "^3.9, < 3.13"
 appdirs = "^1.4.4"
 dask = {extras = ["array"], version = "^2023.1.0"}
 donfig = "^0.7.0"
 python-casacore = "^3.5.1"
-pyarrow = {version = "^12.0.0", optional=true}
+pyarrow = {version = "^13.0.0", optional = true}
 zarr = {version = "^2.12.0", optional=true}
 xarray = {version = "^2023.01.0", optional=true}
 s3fs = {version = "^2023.1.0", optional=true}
 minio = {version = "^7.1.11", optional=true}
 pytest = {version = "^7.1.3", optional=true}
+pandas = {version = "^2.1.2", optional = true}
 
 [tool.poetry.scripts]
 dask-ms = "daskms.apps.entrypoint:main"
 fragments = "daskms.apps.fragments:main"
 
 [tool.poetry.extras]
-arrow = ["pyarrow"]
+arrow = ["pandas", "pyarrow"]
 xarray = ["xarray"]
 zarr = ["zarr"]
 s3 = ["s3fs"]
-complete = ["s3fs", "pyarrow", "xarray", "zarr"]
+complete = ["s3fs", "pandas", "pyarrow", "xarray", "zarr"]
 testing = ["minio", "pytest"]
 
 [tool.poetry.group.dev.dependencies]