From 5449aba8c34bedc2ab45be00a64cd77f54ef1f6d Mon Sep 17 00:00:00 2001 From: Deepyaman Datta Date: Thu, 7 Dec 2023 20:37:19 -0700 Subject: [PATCH] build: move `docker-compose.yml` to `compose.yaml` --- docker-compose.yml => compose.yaml | 1 - docs/contribute/02_workflow.qmd | 2 +- ibis/backends/oracle/tests/conftest.py | 4 ++-- ibis/backends/tests/base.py | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) rename docker-compose.yml => compose.yaml (99%) diff --git a/docker-compose.yml b/compose.yaml similarity index 99% rename from docker-compose.yml rename to compose.yaml index 01c5b4f8578d..c9537f52eeb3 100644 --- a/docker-compose.yml +++ b/compose.yaml @@ -1,4 +1,3 @@ -version: "3.4" services: clickhouse: image: clickhouse/clickhouse-server:23.11.1.2711-alpine diff --git a/docs/contribute/02_workflow.qmd b/docs/contribute/02_workflow.qmd index 41fb2ef412ec..23f822939789 100644 --- a/docs/contribute/02_workflow.qmd +++ b/docs/contribute/02_workflow.qmd @@ -42,7 +42,7 @@ pytest -m sqlite ## Setting up non-trivial backends These client-server backends need to be started before testing them. -They can be started with `docker-compose` directly, or using the `just` tool. +They can be started with `docker compose` directly, or using the `just` tool. - ClickHouse: `just up clickhouse` - PostgreSQL: `just up postgres` diff --git a/ibis/backends/oracle/tests/conftest.py b/ibis/backends/oracle/tests/conftest.py index 79d1de373bfd..addf6a6d3924 100644 --- a/ibis/backends/oracle/tests/conftest.py +++ b/ibis/backends/oracle/tests/conftest.py @@ -23,10 +23,10 @@ ORACLE_PORT = int(os.environ.get("IBIS_TEST_ORACLE_PORT", 1521)) # Creating test DB and user -# The ORACLE_DB env-var needs to be set in the docker-compose.yml file +# The ORACLE_DB env-var needs to be set in the compose.yaml file # Then, after the container is running, exec in and run (from `/opt/oracle`) # ./createAppUser user pass ORACLE_DB -# where ORACLE_DB is the same name you used in the docker-compose file. +# where ORACLE_DB is the same name you used in the Compose file. class TestConf(ServiceBackendTest): diff --git a/ibis/backends/tests/base.py b/ibis/backends/tests/base.py index 8b9ae9a0ca77..116272710c40 100644 --- a/ibis/backends/tests/base.py +++ b/ibis/backends/tests/base.py @@ -346,9 +346,9 @@ class ServiceBackendTest(BackendTest): """ service_name: str | None = None - "Name of service defined in docker-compose.yml corresponding to backend." + "Name of service defined in compose.yaml corresponding to backend." data_volume = "/data" - "Data volume defined in docker-compose.yml corresponding to backend." + "Data volume defined in compose.yaml corresponding to backend." @property @abc.abstractmethod