From 338b53d8720fab85b245d48f453b8554599cf78d Mon Sep 17 00:00:00 2001 From: Yong Date: Mon, 13 Jan 2025 21:56:21 -0600 Subject: [PATCH 1/5] Update poetry version from 1.5.0 to 1.8.5 --- getting-started/spark/notebooks/Dockerfile | 4 ++-- polaris | 2 +- regtests/Dockerfile | 2 +- regtests/client/python/pyproject.toml | 1 + regtests/polaris-reg-test | 4 ++-- regtests/pyspark-setup.sh | 4 ++-- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/getting-started/spark/notebooks/Dockerfile b/getting-started/spark/notebooks/Dockerfile index 4bd3f3122d..2fbf7169aa 100644 --- a/getting-started/spark/notebooks/Dockerfile +++ b/getting-started/spark/notebooks/Dockerfile @@ -21,9 +21,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 && \ +RUN pip install poetry==1.8.5 && \ 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 9af0dfb5d0..351febf730 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 poetry==1.8.5 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 18f4d9bff7..12447cb85e 100644 --- a/regtests/Dockerfile +++ b/regtests/Dockerfile @@ -43,7 +43,7 @@ COPY ./polaris-reg-test /home/spark/polaris RUN python3 -m venv /home/spark/polaris-venv && \ . /home/spark/polaris-venv/bin/activate && \ - pip install poetry==1.5.0 && \ + pip install poetry==1.8.5 && \ deactivate \ RUN ./setup.sh diff --git a/regtests/client/python/pyproject.toml b/regtests/client/python/pyproject.toml index 8824316c7c..0f1674439a 100644 --- a/regtests/client/python/pyproject.toml +++ b/regtests/client/python/pyproject.toml @@ -27,6 +27,7 @@ readme = "README.md" repository = "https://github.com/GIT_USER_ID/GIT_REPO_ID" keywords = ["OpenAPI", "OpenAPI-Generator", "Polaris Management Service"] include = ["polaris.management/py.typed"] +package-mode = false [tool.poetry.dependencies] python = "^3.8" diff --git a/regtests/polaris-reg-test b/regtests/polaris-reg-test index 659cd828d7..2f94677872 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 poetry==1.8.5 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 f94398e956..9a52dca49e 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 poetry==1.8.5 cd client/python python3 -m poetry install -deactivate \ No newline at end of file +deactivate From 470bf0827949101c12ffe84a76796d2132b86f66 Mon Sep 17 00:00:00 2001 From: Yong Date: Thu, 16 Jan 2025 23:17:23 -0600 Subject: [PATCH 2/5] Update poetry version from 1.5.0 to 1.8.5 --- getting-started/spark/notebooks/Dockerfile | 3 ++- polaris | 2 +- regtests/Dockerfile | 3 ++- regtests/polaris-reg-test | 2 +- regtests/pyspark-setup.sh | 2 +- regtests/requirements.txt | 20 ++++++++++++++++++++ 6 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 regtests/requirements.txt diff --git a/getting-started/spark/notebooks/Dockerfile b/getting-started/spark/notebooks/Dockerfile index 2fbf7169aa..2cb014c053 100644 --- a/getting-started/spark/notebooks/Dockerfile +++ b/getting-started/spark/notebooks/Dockerfile @@ -20,8 +20,9 @@ FROM jupyter/all-spark-notebook:spark-3.5.0 COPY --chown=jovyan regtests/client /home/jovyan/client +COPY --chown=jovyan requirements.txt /tmp/ WORKDIR /home/jovyan/ -RUN pip install poetry==1.8.5 && \ +RUN pip install -r /tmp/requirements.txt && \ cd client/python && \ python3 -m poetry install && \ pip install -e . diff --git a/polaris b/polaris index 351febf730..22b8d4760c 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.8.5 + 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 12447cb85e..497b66c013 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.8.5 && \ + pip install -r /tmp/requirements.txt && \ deactivate \ RUN ./setup.sh diff --git a/regtests/polaris-reg-test b/regtests/polaris-reg-test index 2f94677872..e8d66822ee 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.8.5 + pip install -f requirements.txt cp ${SCRIPT_DIR}/regtests/client/python/pyproject.toml ${SCRIPT_DIR} diff --git a/regtests/pyspark-setup.sh b/regtests/pyspark-setup.sh index 9a52dca49e..7f7189a6dd 100755 --- a/regtests/pyspark-setup.sh +++ b/regtests/pyspark-setup.sh @@ -24,7 +24,7 @@ fi . ~/polaris-venv/bin/activate -pip install poetry==1.8.5 +pip install -r requirements.txt cd client/python python3 -m poetry install diff --git a/regtests/requirements.txt b/regtests/requirements.txt new file mode 100644 index 0000000000..1beb63bca0 --- /dev/null +++ b/regtests/requirements.txt @@ -0,0 +1,20 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +poetry==1.8.5 From 651b14a78101507e7e37400e3e9cfd4b1770f052 Mon Sep 17 00:00:00 2001 From: Yong Date: Fri, 17 Jan 2025 00:10:00 -0600 Subject: [PATCH 3/5] Update poetry version from 1.5.0 to 1.8.5 --- regtests/client/python/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/regtests/client/python/pyproject.toml b/regtests/client/python/pyproject.toml index 7692699b4f..4bb0811420 100644 --- a/regtests/client/python/pyproject.toml +++ b/regtests/client/python/pyproject.toml @@ -27,7 +27,7 @@ readme = "README.md" repository = "https://github.com/GIT_USER_ID/GIT_REPO_ID" keywords = ["OpenAPI", "OpenAPI-Generator", "Polaris Management Service"] include = ["polaris.management/py.typed"] -package-mode = false +package-mode = true [tool.poetry.dependencies] python = "^3.8" From 078551d1fb25b07fb13146b3603bacbdc01a76b4 Mon Sep 17 00:00:00 2001 From: Yong Zheng Date: Fri, 17 Jan 2025 01:09:54 -0600 Subject: [PATCH 4/5] Keep poetry version the same in demo --- getting-started/spark/notebooks/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/getting-started/spark/notebooks/Dockerfile b/getting-started/spark/notebooks/Dockerfile index 2cb014c053..3578424f2a 100644 --- a/getting-started/spark/notebooks/Dockerfile +++ b/getting-started/spark/notebooks/Dockerfile @@ -21,8 +21,7 @@ FROM jupyter/all-spark-notebook:spark-3.5.0 COPY --chown=jovyan regtests/client /home/jovyan/client COPY --chown=jovyan requirements.txt /tmp/ -WORKDIR /home/jovyan/ -RUN pip install -r /tmp/requirements.txt && \ +RUN pip install poetry==1.5.0 && \ cd client/python && \ python3 -m poetry install && \ pip install -e . From 4a418005ed20e93ebbfb60e3e5f02f7872bdbd3d Mon Sep 17 00:00:00 2001 From: Yong Zheng Date: Fri, 17 Jan 2025 01:12:37 -0600 Subject: [PATCH 5/5] Keep poetry version the same in demo --- getting-started/spark/notebooks/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/getting-started/spark/notebooks/Dockerfile b/getting-started/spark/notebooks/Dockerfile index 3578424f2a..1e0434896f 100644 --- a/getting-started/spark/notebooks/Dockerfile +++ b/getting-started/spark/notebooks/Dockerfile @@ -20,7 +20,6 @@ FROM jupyter/all-spark-notebook:spark-3.5.0 COPY --chown=jovyan regtests/client /home/jovyan/client -COPY --chown=jovyan requirements.txt /tmp/ RUN pip install poetry==1.5.0 && \ cd client/python && \ python3 -m poetry install && \