chore: revert compose upgrade

nejch · JohnVillalovos · commit dd04e8ef7eee · 2022-10-18T13:59:18.000-07:00
This reverts commit f825d70.
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -78,10 +78,8 @@ Running integration tests
 -------------------------
 
 Integration tests run against a running gitlab instance, using a docker
-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.
+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.
 
 To run these tests:
 
@@ -106,7 +104,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,3 +1,4 @@
 -r requirements.txt
 -r requirements-test.txt
+docker-compose==1.29.2
 pytest-docker==1.0.1
diff --git a/requirements-test.txt b/requirements-test.txt
@@ -3,5 +3,5 @@ pytest==7.1.3
 pytest-console-scripts==1.3.1
 pytest-cov==4.0.0
 pytest-github-actions-annotate-failures==0.1.7
-PyYaml==6.0
+PyYaml==5.4.1
 responses==0.21.0
diff --git a/tests/functional/fixtures/docker.py b/tests/functional/fixtures/docker.py
@@ -5,11 +5,6 @@
 import pytest
 
 
-@pytest.fixture(scope="session")
-def docker_compose_command():
-    return "docker compose"
-
-
 @pytest.fixture(scope="session")
 def docker_compose_project_name():
     """Set a consistent project name to enable optional reuse of containers."""
