From 5a48b82fa1b5b5f3656fbf0433ffd5878d353ed1 Mon Sep 17 00:00:00 2001
From: Istvan Toth <stoty@apache.org>
Date: Wed, 19 Feb 2025 10:06:07 +0100
Subject: [PATCH] PHOENIX-7530 Support Python 3.13 in PhoenixDB

also add workaround for pyenv virtualenv incompatibility
---
 phoenix-queryserver-it/src/it/bin/test_phoenixdb.sh | 2 +-
 python-phoenixdb/Dockerfile                         | 6 +++---
 python-phoenixdb/setup.py                           | 3 ++-
 python-phoenixdb/tox.ini                            | 3 ++-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/phoenix-queryserver-it/src/it/bin/test_phoenixdb.sh b/phoenix-queryserver-it/src/it/bin/test_phoenixdb.sh
index 6d914e4..3ee1ae4 100755
--- a/phoenix-queryserver-it/src/it/bin/test_phoenixdb.sh
+++ b/phoenix-queryserver-it/src/it/bin/test_phoenixdb.sh
@@ -54,7 +54,7 @@ pushd ${PY_ENV_PATH}/bin
 
 # conda activate does stuff with unbound variables :(
 set +u
-. activate ""
+. ./activate ""
 
 popd
 
diff --git a/python-phoenixdb/Dockerfile b/python-phoenixdb/Dockerfile
index daf8a4e..5172a99 100644
--- a/python-phoenixdb/Dockerfile
+++ b/python-phoenixdb/Dockerfile
@@ -13,13 +13,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from advian/tox-base:ubuntu-jammy-2024-02-07 as tox
+from advian/tox-base:ubuntu-jammy-2024-10-10 as tox
 
 ###########################
 # Prebuild given versions #
 ###########################
-ARG BUILD_PYTHON_VERSIONS="3.11 3.10 3.9 3.8" #Can we take this from the parent image ?
-ARG EXTRA_PYTHON_VERSIONS="3.12 3.5 3.6 3.7 2.7"
+ARG BUILD_PYTHON_VERSIONS="3.13 3.12 3.11 3.10 3.9" #Can we take this from the parent image ?
+ARG EXTRA_PYTHON_VERSIONS="3.5 3.6 3.7 3.8 2.7"
 RUN export RESOLVED_VERSIONS=`pyenv_resolve $BUILD_PYTHON_VERSIONS` \
     && export EXTRA_RESOLVED_VERSIONS=`pyenv_resolve $EXTRA_PYTHON_VERSIONS` \
     && for pyver in $EXTRA_RESOLVED_VERSIONS; do pyenv install $pyver; done \
diff --git a/python-phoenixdb/setup.py b/python-phoenixdb/setup.py
index 2e078dd..3727e1e 100644
--- a/python-phoenixdb/setup.py
+++ b/python-phoenixdb/setup.py
@@ -94,7 +94,8 @@ def readme():
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
-        'Programming Language :: Python :: 3.12'
+        'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13'
     ],
     install_requires=install_requires,
     tests_require=[
diff --git a/python-phoenixdb/tox.ini b/python-phoenixdb/tox.ini
index 8b41293..752e557 100644
--- a/python-phoenixdb/tox.ini
+++ b/python-phoenixdb/tox.ini
@@ -24,7 +24,8 @@ envlist = py27-SQLAlchemy{13,14},
   py39-SQLAlchemy{13,14,20},
   py310-SQLAlchemy{13,14,20},
   py311-SQLAlchemy{13,14,20},
-  py312-SQLAlchemy{13,14,20}
+  py312-SQLAlchemy{13,14,20},
+  py313-SQLAlchemy{13,14,20}
 [testenv]
 passenv = PHOENIXDB_TEST_DB_URL
 commands =