This is an automated email from the ASF dual-hosted git repository.
honahx pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iceberg-python.git
The following commit(s) were added to refs/heads/main by this push:
new 474b37bb [CI FIx] Use Docker Compose V2 (#575)
474b37bb is described below
commit 474b37bbbd1a84ee97cb43d1ced3ea18d5718153
Author: Honah J <[email protected]>
AuthorDate: Wed Apr 3 03:19:31 2024 -0400
[CI FIx] Use Docker Compose V2 (#575)
---
.github/workflows/python-integration.yml | 2 +-
Makefile | 22 +++++++++++-----------
dev/run-azurite.sh | 4 ++--
dev/run-gcs-server.sh | 4 ++--
dev/run-minio.sh | 4 ++--
5 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/.github/workflows/python-integration.yml
b/.github/workflows/python-integration.yml
index b361f8db..6aeae0fc 100644
--- a/.github/workflows/python-integration.yml
+++ b/.github/workflows/python-integration.yml
@@ -43,4 +43,4 @@ jobs:
run: make test-integration
- name: Show debug logs
if: ${{ failure() }}
- run: docker-compose -f dev/docker-compose.yml logs
+ run: docker compose -f dev/docker-compose.yml logs
diff --git a/Makefile b/Makefile
index c3e816eb..010410e3 100644
--- a/Makefile
+++ b/Makefile
@@ -37,17 +37,17 @@ test-s3:
poetry run pytest tests/ -m s3 ${PYTEST_ARGS}
test-integration:
- docker-compose -f dev/docker-compose-integration.yml kill
- docker-compose -f dev/docker-compose-integration.yml rm -f
- docker-compose -f dev/docker-compose-integration.yml up -d
+ docker compose -f dev/docker-compose-integration.yml kill
+ docker compose -f dev/docker-compose-integration.yml rm -f
+ docker compose -f dev/docker-compose-integration.yml up -d
sleep 10
- docker-compose -f dev/docker-compose-integration.yml exec -T
spark-iceberg ipython ./provision.py
+ docker compose -f dev/docker-compose-integration.yml exec -T
spark-iceberg ipython ./provision.py
poetry run pytest tests/ -v -m integration ${PYTEST_ARGS}
test-integration-rebuild:
- docker-compose -f dev/docker-compose-integration.yml kill
- docker-compose -f dev/docker-compose-integration.yml rm -f
- docker-compose -f dev/docker-compose-integration.yml build --no-cache
+ docker compose -f dev/docker-compose-integration.yml kill
+ docker compose -f dev/docker-compose-integration.yml rm -f
+ docker compose -f dev/docker-compose-integration.yml build --no-cache
test-adlfs:
sh ./dev/run-azurite.sh
@@ -58,12 +58,12 @@ test-gcs:
poetry run pytest tests/ -m gcs ${PYTEST_ARGS}
test-coverage:
- docker-compose -f dev/docker-compose-integration.yml kill
- docker-compose -f dev/docker-compose-integration.yml rm -f
- docker-compose -f dev/docker-compose-integration.yml up -d
+ docker compose -f dev/docker-compose-integration.yml kill
+ docker compose -f dev/docker-compose-integration.yml rm -f
+ docker compose -f dev/docker-compose-integration.yml up -d
sh ./dev/run-azurite.sh
sh ./dev/run-gcs-server.sh
- docker-compose -f dev/docker-compose-integration.yml exec -T
spark-iceberg ipython ./provision.py
+ docker compose -f dev/docker-compose-integration.yml exec -T
spark-iceberg ipython ./provision.py
poetry run coverage run --source=pyiceberg/ -m pytest tests/
${PYTEST_ARGS}
poetry run coverage report -m --fail-under=90
poetry run coverage html
diff --git a/dev/run-azurite.sh b/dev/run-azurite.sh
index c2181558..8d2a3962 100755
--- a/dev/run-azurite.sh
+++ b/dev/run-azurite.sh
@@ -23,8 +23,8 @@ set -ex
if [ $(docker ps -q --filter "name=azurite" --filter "status=running" ) ]; then
echo "Azurite backend running"
else
- docker-compose -f dev/docker-compose-azurite.yml kill
- docker-compose -f dev/docker-compose-azurite.yml up -d
+ docker compose -f dev/docker-compose-azurite.yml kill
+ docker compose -f dev/docker-compose-azurite.yml up -d
while [ -z $(docker ps -q --filter "name=azurite" --filter
"status=running" ) ]
do
echo "Waiting for Azurite"
diff --git a/dev/run-gcs-server.sh b/dev/run-gcs-server.sh
index 289d8900..06269506 100644
--- a/dev/run-gcs-server.sh
+++ b/dev/run-gcs-server.sh
@@ -23,8 +23,8 @@ set -ex
if [ $(docker ps -q --filter "name=gcs-server" --filter "status=running" ) ];
then
echo "Fake GCS Server running"
else
- docker-compose -f dev/docker-compose-gcs-server.yml kill
- docker-compose -f dev/docker-compose-gcs-server.yml up -d
+ docker compose -f dev/docker-compose-gcs-server.yml kill
+ docker compose -f dev/docker-compose-gcs-server.yml up -d
while [ -z $(docker ps -q --filter "name=gcs-server" --filter
"status=running" ) ]
do
echo "Waiting for Fake GCS Server"
diff --git a/dev/run-minio.sh b/dev/run-minio.sh
index 0db37012..3e4a55c1 100755
--- a/dev/run-minio.sh
+++ b/dev/run-minio.sh
@@ -23,8 +23,8 @@ set -ex
if [ $(docker ps -q --filter "name=pyiceberg-minio" --filter "status=running"
) ]; then
echo "Minio backend running"
else
- docker-compose -f dev/docker-compose.yml kill
- docker-compose -f dev/docker-compose.yml up -d
+ docker compose -f dev/docker-compose.yml kill
+ docker compose -f dev/docker-compose.yml up -d
while [ -z $(docker ps -q --filter "name=pyiceberg-minio" --filter
"status=running" ) ]
do
echo "Waiting for Minio"
