pytest-docker 3.2.4__tar.gz → 3.2.6__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (20) hide show
  1. {pytest_docker-3.2.4/src/pytest_docker.egg-info → pytest_docker-3.2.6}/PKG-INFO +9 -3
  2. {pytest_docker-3.2.4 → pytest_docker-3.2.6}/README.md +5 -1
  3. {pytest_docker-3.2.4 → pytest_docker-3.2.6}/setup.cfg +4 -2
  4. {pytest_docker-3.2.4 → pytest_docker-3.2.6}/src/pytest_docker/__init__.py +2 -0
  5. {pytest_docker-3.2.4 → pytest_docker-3.2.6}/src/pytest_docker/plugin.py +1 -1
  6. {pytest_docker-3.2.4 → pytest_docker-3.2.6/src/pytest_docker.egg-info}/PKG-INFO +9 -3
  7. {pytest_docker-3.2.4 → pytest_docker-3.2.6}/src/pytest_docker.egg-info/requires.txt +1 -1
  8. {pytest_docker-3.2.4 → pytest_docker-3.2.6}/tests/test_docker_services.py +7 -7
  9. {pytest_docker-3.2.4 → pytest_docker-3.2.6}/tests/test_fixtures.py +1 -1
  10. {pytest_docker-3.2.4 → pytest_docker-3.2.6}/LICENSE.txt +0 -0
  11. {pytest_docker-3.2.4 → pytest_docker-3.2.6}/pyproject.toml +0 -0
  12. {pytest_docker-3.2.4 → pytest_docker-3.2.6}/setup.py +0 -0
  13. {pytest_docker-3.2.4 → pytest_docker-3.2.6}/src/pytest_docker/py.typed +0 -0
  14. {pytest_docker-3.2.4 → pytest_docker-3.2.6}/src/pytest_docker.egg-info/SOURCES.txt +0 -0
  15. {pytest_docker-3.2.4 → pytest_docker-3.2.6}/src/pytest_docker.egg-info/dependency_links.txt +0 -0
  16. {pytest_docker-3.2.4 → pytest_docker-3.2.6}/src/pytest_docker.egg-info/entry_points.txt +0 -0
  17. {pytest_docker-3.2.4 → pytest_docker-3.2.6}/src/pytest_docker.egg-info/top_level.txt +0 -0
  18. {pytest_docker-3.2.4 → pytest_docker-3.2.6}/tests/test_docker_ip.py +0 -0
  19. {pytest_docker-3.2.4 → pytest_docker-3.2.6}/tests/test_dockercomposeexecutor.py +0 -0
  20. {pytest_docker-3.2.4 → pytest_docker-3.2.6}/tests/test_integration.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: pytest-docker
3
- Version: 3.2.4
3
+ Version: 3.2.6
4
4
  Summary: Simple pytest fixtures for Docker and Docker Compose based tests
5
5
  Home-page: https://github.com/avast/pytest-docker
6
6
  Author: Max K., Andre Caron
@@ -14,6 +14,8 @@ Classifier: Programming Language :: Python :: 3.10
14
14
  Classifier: Programming Language :: Python :: 3.11
15
15
  Classifier: Programming Language :: Python :: 3.12
16
16
  Classifier: Programming Language :: Python :: 3.13
17
+ Classifier: Programming Language :: Python :: 3.14
18
+ Classifier: Programming Language :: Python :: 3.15
17
19
  Classifier: License :: OSI Approved :: MIT License
18
20
  Classifier: Topic :: Utilities
19
21
  Classifier: Intended Audience :: Developers
@@ -23,7 +25,7 @@ Classifier: Operating System :: Microsoft :: Windows
23
25
  Requires-Python: >=3.8
24
26
  Description-Content-Type: text/markdown
25
27
  License-File: LICENSE.txt
26
- Requires-Dist: pytest<10.0,>=4.0
28
+ Requires-Dist: pytest<10.0,>=6.2
27
29
  Requires-Dist: attrs>=19.2.0
28
30
  Provides-Extra: docker-compose-v1
29
31
  Requires-Dist: docker-compose<2.0,>=1.27.3; extra == "docker-compose-v1"
@@ -133,6 +135,10 @@ def test_status_code(http_service):
133
135
  assert response.status_code == status
134
136
  ```
135
137
 
138
+ > The default `docker_setup` command includes `--wait`, which respects either the
139
+ > image `HEALTHCHECK` or the compose `healthcheck`. Generally, if those
140
+ > are configured properly, `wait_until_responsive` should not be required.
141
+
136
142
  By default, this plugin will try to open `docker-compose.yml` in your
137
143
  `tests` directory. If you need to use a custom location, override the
138
144
  `docker_compose_file` fixture inside your `conftest.py` file:
@@ -177,7 +183,7 @@ def docker_compose_project_name() -> str:
177
183
  # Stop the stack before starting a new one
178
184
  @pytest.fixture(scope="session")
179
185
  def docker_setup():
180
- return ["down -v", "up --build -d"]
186
+ return ["down -v", "up --build --wait"]
181
187
  ```
182
188
 
183
189
 
@@ -94,6 +94,10 @@ def test_status_code(http_service):
94
94
  assert response.status_code == status
95
95
  ```
96
96
 
97
+ > The default `docker_setup` command includes `--wait`, which respects either the
98
+ > image `HEALTHCHECK` or the compose `healthcheck`. Generally, if those
99
+ > are configured properly, `wait_until_responsive` should not be required.
100
+
97
101
  By default, this plugin will try to open `docker-compose.yml` in your
98
102
  `tests` directory. If you need to use a custom location, override the
99
103
  `docker_compose_file` fixture inside your `conftest.py` file:
@@ -138,7 +142,7 @@ def docker_compose_project_name() -> str:
138
142
  # Stop the stack before starting a new one
139
143
  @pytest.fixture(scope="session")
140
144
  def docker_setup():
141
- return ["down -v", "up --build -d"]
145
+ return ["down -v", "up --build --wait"]
142
146
  ```
143
147
 
144
148
 
@@ -1,6 +1,6 @@
1
1
  [metadata]
2
2
  name = pytest-docker
3
- version = 3.2.4
3
+ version = 3.2.6
4
4
  description = Simple pytest fixtures for Docker and Docker Compose based tests
5
5
  long_description = file: README.md
6
6
  long_description_content_type = text/markdown
@@ -17,6 +17,8 @@ classifiers =
17
17
  Programming Language :: Python :: 3.11
18
18
  Programming Language :: Python :: 3.12
19
19
  Programming Language :: Python :: 3.13
20
+ Programming Language :: Python :: 3.14
21
+ Programming Language :: Python :: 3.15
20
22
  License :: OSI Approved :: MIT License
21
23
  Topic :: Utilities
22
24
  Intended Audience :: Developers
@@ -30,7 +32,7 @@ package_dir =
30
32
  =src
31
33
  packages = pytest_docker
32
34
  install_requires =
33
- pytest >=4.0, <10.0
35
+ pytest >=6.2, <10.0
34
36
  attrs >=19.2.0
35
37
 
36
38
  [options.extras_require]
@@ -1,3 +1,5 @@
1
+ from __future__ import annotations
2
+
1
3
  import pytest
2
4
 
3
5
  from .plugin import (
@@ -179,7 +179,7 @@ def docker_cleanup() -> Union[List[str], str]:
179
179
 
180
180
 
181
181
  def get_setup_command() -> Union[List[str], str]:
182
- return ["up --build -d"]
182
+ return ["up --build --wait"]
183
183
 
184
184
 
185
185
  @pytest.fixture(scope=containers_scope)
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: pytest-docker
3
- Version: 3.2.4
3
+ Version: 3.2.6
4
4
  Summary: Simple pytest fixtures for Docker and Docker Compose based tests
5
5
  Home-page: https://github.com/avast/pytest-docker
6
6
  Author: Max K., Andre Caron
@@ -14,6 +14,8 @@ Classifier: Programming Language :: Python :: 3.10
14
14
  Classifier: Programming Language :: Python :: 3.11
15
15
  Classifier: Programming Language :: Python :: 3.12
16
16
  Classifier: Programming Language :: Python :: 3.13
17
+ Classifier: Programming Language :: Python :: 3.14
18
+ Classifier: Programming Language :: Python :: 3.15
17
19
  Classifier: License :: OSI Approved :: MIT License
18
20
  Classifier: Topic :: Utilities
19
21
  Classifier: Intended Audience :: Developers
@@ -23,7 +25,7 @@ Classifier: Operating System :: Microsoft :: Windows
23
25
  Requires-Python: >=3.8
24
26
  Description-Content-Type: text/markdown
25
27
  License-File: LICENSE.txt
26
- Requires-Dist: pytest<10.0,>=4.0
28
+ Requires-Dist: pytest<10.0,>=6.2
27
29
  Requires-Dist: attrs>=19.2.0
28
30
  Provides-Extra: docker-compose-v1
29
31
  Requires-Dist: docker-compose<2.0,>=1.27.3; extra == "docker-compose-v1"
@@ -133,6 +135,10 @@ def test_status_code(http_service):
133
135
  assert response.status_code == status
134
136
  ```
135
137
 
138
+ > The default `docker_setup` command includes `--wait`, which respects either the
139
+ > image `HEALTHCHECK` or the compose `healthcheck`. Generally, if those
140
+ > are configured properly, `wait_until_responsive` should not be required.
141
+
136
142
  By default, this plugin will try to open `docker-compose.yml` in your
137
143
  `tests` directory. If you need to use a custom location, override the
138
144
  `docker_compose_file` fixture inside your `conftest.py` file:
@@ -177,7 +183,7 @@ def docker_compose_project_name() -> str:
177
183
  # Stop the stack before starting a new one
178
184
  @pytest.fixture(scope="session")
179
185
  def docker_setup():
180
- return ["down -v", "up --build -d"]
186
+ return ["down -v", "up --build --wait"]
181
187
  ```
182
188
 
183
189
 
@@ -1,4 +1,4 @@
1
- pytest<10.0,>=4.0
1
+ pytest<10.0,>=6.2
2
2
  attrs>=19.2.0
3
3
 
4
4
  [docker-compose-v1]
@@ -49,7 +49,7 @@ def test_docker_services() -> None:
49
49
  # Both should have been called.
50
50
  assert check_output.call_args_list == [
51
51
  mock.call(
52
- 'docker compose -f "docker-compose.yml" -p "pytest123" up --build -d',
52
+ 'docker compose -f "docker-compose.yml" -p "pytest123" up --build --wait',
53
53
  stderr=subprocess.STDOUT,
54
54
  shell=True,
55
55
  ),
@@ -100,7 +100,7 @@ def test_docker_services_unused_port() -> None:
100
100
  assert check_output.call_args_list == [
101
101
  mock.call(
102
102
  'docker compose -f "docker-compose.yml" -p "pytest123" '
103
- "up --build -d", # pylint: disable:=implicit-str-concat
103
+ 'up --build --wait', # pylint: disable:=implicit-str-concat
104
104
  shell=True,
105
105
  stderr=subprocess.STDOUT,
106
106
  ),
@@ -147,7 +147,7 @@ def test_docker_services_failure() -> None:
147
147
  assert check_output.call_args_list == [
148
148
  mock.call(
149
149
  'docker compose -f "docker-compose.yml" -p "pytest123" '
150
- "up --build -d", # pylint: disable:=implicit-str-concat
150
+ "up --build --wait", # pylint: disable:=implicit-str-concat
151
151
  shell=True,
152
152
  stderr=subprocess.STDOUT,
153
153
  )
@@ -188,7 +188,7 @@ def test_single_commands() -> None:
188
188
  "docker compose",
189
189
  "docker-compose.yml",
190
190
  docker_compose_project_name="pytest123",
191
- docker_setup="up --build -d",
191
+ docker_setup="up --build --wait",
192
192
  docker_cleanup="down -v",
193
193
  ) as services:
194
194
  assert isinstance(services, Services)
@@ -212,7 +212,7 @@ def test_single_commands() -> None:
212
212
  # Both should have been called.
213
213
  assert check_output.call_args_list == [
214
214
  mock.call(
215
- 'docker compose -f "docker-compose.yml" -p "pytest123" up --build -d',
215
+ 'docker compose -f "docker-compose.yml" -p "pytest123" up --build --wait',
216
216
  stderr=subprocess.STDOUT,
217
217
  shell=True,
218
218
  ),
@@ -242,7 +242,7 @@ def test_multiple_commands() -> None:
242
242
  "docker compose",
243
243
  "docker-compose.yml",
244
244
  docker_compose_project_name="pytest123",
245
- docker_setup=["ps", "up --build -d"],
245
+ docker_setup=["ps", "up --build --wait"],
246
246
  docker_cleanup=["down -v", "ps"],
247
247
  ) as services:
248
248
  assert isinstance(services, Services)
@@ -271,7 +271,7 @@ def test_multiple_commands() -> None:
271
271
  shell=True,
272
272
  ),
273
273
  mock.call(
274
- 'docker compose -f "docker-compose.yml" -p "pytest123" up --build -d',
274
+ 'docker compose -f "docker-compose.yml" -p "pytest123" up --build --wait',
275
275
  stderr=subprocess.STDOUT,
276
276
  shell=True,
277
277
  ),
@@ -21,7 +21,7 @@ def test_docker_cleanup(docker_cleanup: List[str]) -> None:
21
21
 
22
22
 
23
23
  def test_docker_setup(docker_setup: List[str]) -> None:
24
- assert docker_setup == ["up --build -d"]
24
+ assert docker_setup == ["up --build --wait"]
25
25
 
26
26
 
27
27
  def test_docker_compose_comand(docker_compose_command: str) -> None:
File without changes
File without changes