This is an automated email from the ASF dual-hosted git repository.
adutra pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/polaris.git
The following commit(s) were added to refs/heads/main by this push:
new 1db61206 Update poetry version from 1.5.0 to 1.8.5 (#726)
1db61206 is described below
commit 1db61206f073aa9f940015b03e10d2fbd2fe7e86
Author: MonkeyCanCode <[email protected]>
AuthorDate: Fri Jan 24 08:29:45 2025 -0600
Update poetry version from 1.5.0 to 1.8.5 (#726)
---
getting-started/spark/notebooks/Dockerfile | 3 +--
polaris | 2 +-
regtests/Dockerfile | 3 ++-
regtests/client/python/pyproject.toml | 1 +
regtests/polaris-reg-test | 4 ++--
regtests/pyspark-setup.sh | 4 ++--
regtests/{pyspark-setup.sh => requirements.txt} | 13 +------------
7 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/getting-started/spark/notebooks/Dockerfile
b/getting-started/spark/notebooks/Dockerfile
index 4bd3f312..1e043489 100644
--- a/getting-started/spark/notebooks/Dockerfile
+++ b/getting-started/spark/notebooks/Dockerfile
@@ -20,10 +20,9 @@
FROM jupyter/all-spark-notebook:spark-3.5.0
COPY --chown=jovyan regtests/client /home/jovyan/client
-WORKDIR /home/jovyan/
RUN pip install poetry==1.5.0 && \
cd client/python && \
python3 -m poetry install && \
pip install -e .
-WORKDIR /home/jovyan/
\ No newline at end of file
+WORKDIR /home/jovyan/
diff --git a/polaris b/polaris
index 9af0dfb5..22b8d476 100755
--- a/polaris
+++ b/polaris
@@ -23,7 +23,7 @@ if [ ! -d ${SCRIPT_DIR}/polaris-venv ]; then
echo "Performing first-time setup for the Python client..."
python3 -m venv ${SCRIPT_DIR}/polaris-venv
. ${SCRIPT_DIR}/polaris-venv/bin/activate
- pip install poetry==1.5.0
+ pip install -r regtests/requirements.txt
cp ${SCRIPT_DIR}/regtests/client/python/pyproject.toml ${SCRIPT_DIR}
pushd $SCRIPT_DIR && poetry install ; popd
diff --git a/regtests/Dockerfile b/regtests/Dockerfile
index 18f4d9bf..497b66c0 100644
--- a/regtests/Dockerfile
+++ b/regtests/Dockerfile
@@ -40,10 +40,11 @@ COPY ./setup.sh /home/spark/regtests/setup.sh
COPY ./pyspark-setup.sh /home/spark/regtests/pyspark-setup.sh
COPY ./client/python /home/spark/regtests/client/python
COPY ./polaris-reg-test /home/spark/polaris
+COPY ./requirements.txt /tmp/
RUN python3 -m venv /home/spark/polaris-venv && \
. /home/spark/polaris-venv/bin/activate && \
- pip install poetry==1.5.0 && \
+ pip install -r /tmp/requirements.txt && \
deactivate \
RUN ./setup.sh
diff --git a/regtests/client/python/pyproject.toml
b/regtests/client/python/pyproject.toml
index 2161e1e2..b07807e8 100644
--- a/regtests/client/python/pyproject.toml
+++ b/regtests/client/python/pyproject.toml
@@ -27,6 +27,7 @@ readme = "README.md"
repository = "https://github.com/apache/polaris/";
keywords = ["Polaris", "Polaris Management Service"]
include = ["polaris.management/py.typed"]
+package-mode = true
[tool.poetry.dependencies]
python = "^3.8"
diff --git a/regtests/polaris-reg-test b/regtests/polaris-reg-test
index 659cd828..e8d66822 100755
--- a/regtests/polaris-reg-test
+++ b/regtests/polaris-reg-test
@@ -37,7 +37,7 @@ if [ ! -d ${SCRIPT_DIR}/polaris-venv ]; then
echo "Performing first-time setup for the Python client..."
python3 -m venv ${SCRIPT_DIR}/polaris-venv
. ${SCRIPT_DIR}/polaris-venv/bin/activate
- pip install poetry==1.5.0
+ pip install -f requirements.txt
cp ${SCRIPT_DIR}/regtests/client/python/pyproject.toml ${SCRIPT_DIR}
@@ -61,4 +61,4 @@ if [ $status -ne 0 ]; then
exit 1
fi
-exit 0
\ No newline at end of file
+exit 0
diff --git a/regtests/pyspark-setup.sh b/regtests/pyspark-setup.sh
index f94398e9..7f7189a6 100755
--- a/regtests/pyspark-setup.sh
+++ b/regtests/pyspark-setup.sh
@@ -24,8 +24,8 @@ fi
. ~/polaris-venv/bin/activate
-pip install poetry==1.5.0
+pip install -r requirements.txt
cd client/python
python3 -m poetry install
-deactivate
\ No newline at end of file
+deactivate
diff --git a/regtests/pyspark-setup.sh b/regtests/requirements.txt
old mode 100755
new mode 100644
similarity index 80%
copy from regtests/pyspark-setup.sh
copy to regtests/requirements.txt
index f94398e9..1beb63bc
--- a/regtests/pyspark-setup.sh
+++ b/regtests/requirements.txt
@@ -1,4 +1,3 @@
-#!/bin/bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -18,14 +17,4 @@
# under the License.
#
-if [ ! -d ~/polaris-venv ]; then
- python3 -m venv ~/polaris-venv
-fi
-
-. ~/polaris-venv/bin/activate
-
-pip install poetry==1.5.0
-
-cd client/python
-python3 -m poetry install
-deactivate
\ No newline at end of file
+poetry==1.8.5
