diff options
| author | Nejc Habjan <nejc.habjan@siemens.com> | 2022-10-18 22:30:19 +0200 |
|---|---|---|
| committer | John Villalovos <john@sodarock.com> | 2022-10-18 13:59:18 -0700 |
| commit | dd04e8ef7eee2793fba38a1eec019b00b3bb616e (patch) | |
| tree | 8a3f9ef64cac5ab4e47a66a98803adb41072c5ad | |
| parent | bcc1eb4571f76b3ca0954adb5525b26f05958e3f (diff) | |
| download | gitlab-dd04e8ef7eee2793fba38a1eec019b00b3bb616e.tar.gz | |
chore: revert compose upgrade
This reverts commit f825d70e25feae8cd9da84e768ec6075edbc2200.
| -rw-r--r-- | CONTRIBUTING.rst | 8 | ||||
| -rw-r--r-- | requirements-docker.txt | 1 | ||||
| -rw-r--r-- | requirements-test.txt | 2 | ||||
| -rw-r--r-- | tests/functional/fixtures/docker.py | 5 |
4 files changed, 5 insertions, 11 deletions
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index a17d496..93a84b5 100644 --- 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 index fe3656f..8816f31 100644 --- 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 index 4dc6505..1566d8d 100644 --- 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 index 1c72b50..c712487 100644 --- a/tests/functional/fixtures/docker.py +++ b/tests/functional/fixtures/docker.py @@ -6,11 +6,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.""" return "pytest-python-gitlab" |