refactor(deps): drop compose v1 dependency in favor of v2

nejch · JohnVillalovos · commit f825d70e25fe · 2022-10-15T09:55:18.000-07:00
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -78,8 +78,10 @@ Running integration tests
 -------------------------
 
 Integration tests run against a running gitlab instance, using a docker
-container. You need to have docker installed on the test machine, and your user
-must have the correct permissions to talk to the docker daemon.
+container. You need to have docker and `docker compose
+<https://docs.docker.com/compose/install/>`_
+installed on the test machine, and your user must have the correct permissions
+to talk to the docker daemon.
 
 To run these tests:
 
@@ -104,7 +106,7 @@ up of the containers by running:
 
 .. code-block:: bash
 
-   docker-compose -f tests/functional/fixtures/docker-compose.yml -p pytest-python-gitlab down -v
+   docker compose -f tests/functional/fixtures/docker-compose.yml -p pytest-python-gitlab down -v
 
 By default, the tests run against the latest version of the ``gitlab/gitlab-ce``
 image. You can override both the image and tag by providing either the
diff --git a/requirements-docker.txt b/requirements-docker.txt
@@ -1,4 +1,3 @@
 -r requirements.txt
 -r requirements-test.txt
-docker-compose==1.29.2 # prevent inconsistent .env behavior from system install
 pytest-docker
diff --git a/tests/functional/conftest.py b/tests/functional/conftest.py
@@ -34,6 +34,11 @@ def gitlab_version(gl) -> GitlabVersion:
     return GitlabVersion(major=major, minor=minor, patch=patch, revision=revision)
 
 
+@pytest.fixture(scope="session")
+def docker_compose_command():
+    return "docker compose"
+
+
 @pytest.fixture(scope="session")
 def fixture_dir(test_dir) -> pathlib.Path:
     return test_dir / "functional" / "fixtures"
