Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitdd04e8e

Browse files
nejchJohnVillalovos
authored andcommitted
chore: revert compose upgrade
This reverts commitf825d70.
1 parentbcc1eb4 commitdd04e8e

File tree

4 files changed

+5
-11
lines changed

4 files changed

+5
-11
lines changed

‎CONTRIBUTING.rst

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,8 @@ Running integration tests
7878
-------------------------
7979

8080
Integration tests run against a running gitlab instance, using a docker
81-
container. You need to have docker and `docker compose
82-
<https://docs.docker.com/compose/install/>`_
83-
installed on the test machine, and your user must have the correct permissions
84-
to talk to the docker daemon.
81+
container. You need to have docker installed on the test machine, and your user
82+
must have the correct permissions to talk to the docker daemon.
8583

8684
To run these tests:
8785

@@ -106,7 +104,7 @@ up of the containers by running:
106104

107105
..code-block::bash
108106
109-
dockercompose -f tests/functional/fixtures/docker-compose.yml -p pytest-python-gitlab down -v
107+
docker-compose -f tests/functional/fixtures/docker-compose.yml -p pytest-python-gitlab down -v
110108
111109
By default, the tests run against the latest version of the ``gitlab/gitlab-ce``
112110
image. You can override both the image and tag by providing either the

‎requirements-docker.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
-r requirements.txt
22
-r requirements-test.txt
3+
docker-compose==1.29.2
34
pytest-docker==1.0.1

‎requirements-test.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ pytest==7.1.3
33
pytest-console-scripts==1.3.1
44
pytest-cov==4.0.0
55
pytest-github-actions-annotate-failures==0.1.7
6-
PyYaml==6.0
6+
PyYaml==5.4.1
77
responses==0.21.0

‎tests/functional/fixtures/docker.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55
importpytest
66

77

8-
@pytest.fixture(scope="session")
9-
defdocker_compose_command():
10-
return"docker compose"
11-
12-
138
@pytest.fixture(scope="session")
149
defdocker_compose_project_name():
1510
"""Set a consistent project name to enable optional reuse of containers."""

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp