Skip to content

Commit 1db6120

Browse files
Update poetry version from 1.5.0 to 1.8.5 (#726)
1 parent 3c3fc95 commit 1db6120

File tree

7 files changed

+29
-8
lines changed

7 files changed

+29
-8
lines changed

getting-started/spark/notebooks/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,9 @@
2020
FROM jupyter/all-spark-notebook:spark-3.5.0
2121

2222
COPY --chown=jovyan regtests/client /home/jovyan/client
23-
WORKDIR /home/jovyan/
2423
RUN pip install poetry==1.5.0 && \
2524
cd client/python && \
2625
python3 -m poetry install && \
2726
pip install -e .
2827

29-
WORKDIR /home/jovyan/
28+
WORKDIR /home/jovyan/

polaris

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ if [ ! -d ${SCRIPT_DIR}/polaris-venv ]; then
2323
echo "Performing first-time setup for the Python client..."
2424
python3 -m venv ${SCRIPT_DIR}/polaris-venv
2525
. ${SCRIPT_DIR}/polaris-venv/bin/activate
26-
pip install poetry==1.5.0
26+
pip install -r regtests/requirements.txt
2727

2828
cp ${SCRIPT_DIR}/regtests/client/python/pyproject.toml ${SCRIPT_DIR}
2929
pushd $SCRIPT_DIR && poetry install ; popd

regtests/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,11 @@ COPY ./setup.sh /home/spark/regtests/setup.sh
4040
COPY ./pyspark-setup.sh /home/spark/regtests/pyspark-setup.sh
4141
COPY ./client/python /home/spark/regtests/client/python
4242
COPY ./polaris-reg-test /home/spark/polaris
43+
COPY ./requirements.txt /tmp/
4344

4445
RUN python3 -m venv /home/spark/polaris-venv && \
4546
. /home/spark/polaris-venv/bin/activate && \
46-
pip install poetry==1.5.0 && \
47+
pip install -r /tmp/requirements.txt && \
4748
deactivate \
4849
RUN ./setup.sh
4950

regtests/client/python/pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ readme = "README.md"
2727
repository = "https://github.com/apache/polaris/"
2828
keywords = ["Polaris", "Polaris Management Service"]
2929
include = ["polaris.management/py.typed"]
30+
package-mode = true
3031

3132
[tool.poetry.dependencies]
3233
python = "^3.8"

regtests/polaris-reg-test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ if [ ! -d ${SCRIPT_DIR}/polaris-venv ]; then
3737
echo "Performing first-time setup for the Python client..."
3838
python3 -m venv ${SCRIPT_DIR}/polaris-venv
3939
. ${SCRIPT_DIR}/polaris-venv/bin/activate
40-
pip install poetry==1.5.0
40+
pip install -f requirements.txt
4141

4242
cp ${SCRIPT_DIR}/regtests/client/python/pyproject.toml ${SCRIPT_DIR}
4343

@@ -61,4 +61,4 @@ if [ $status -ne 0 ]; then
6161
exit 1
6262
fi
6363

64-
exit 0
64+
exit 0

regtests/pyspark-setup.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ fi
2424

2525
. ~/polaris-venv/bin/activate
2626

27-
pip install poetry==1.5.0
27+
pip install -r requirements.txt
2828

2929
cd client/python
3030
python3 -m poetry install
31-
deactivate
31+
deactivate

regtests/requirements.txt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#
2+
# Licensed to the Apache Software Foundation (ASF) under one
3+
# or more contributor license agreements. See the NOTICE file
4+
# distributed with this work for additional information
5+
# regarding copyright ownership. The ASF licenses this file
6+
# to you under the Apache License, Version 2.0 (the
7+
# "License"); you may not use this file except in compliance
8+
# with the License. You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing,
13+
# software distributed under the License is distributed on an
14+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
# KIND, either express or implied. See the License for the
16+
# specific language governing permissions and limitations
17+
# under the License.
18+
#
19+
20+
poetry==1.8.5

0 commit comments

Comments
 (0)