Skip to content

Commit 3beb54f

Browse files
authored
Merge branch 'master' into master
2 parents d6b7de4 + e53a7e0 commit 3beb54f

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

CHANGELOG.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Changelog
22

3-
## Unreleased
4-
Changes:
3+
## Version 1.0.0
4+
Breaking changes:
55
- Default behavior is not to install `docker-compose` at all when
6-
installing `pytest-docker` with PIP. If you want to, you install
7-
`pytest-docker` with the `docker-compose-v1` extra (`pip install
8-
pytest-docker[docker-compose-v1]`).
6+
installing `pytest-docker` with PIP. Use the `docker-compose-v1` extra.
7+
8+
Feat:
99
- Add support for Docker Compose v2 via a new pytest fixture,
1010
`docker_compose_command` that should return `docker compose`.
1111

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[metadata]
22
name = pytest-docker
3-
version = 0.13.0
3+
version = 1.0.0
44
description = Simple pytest fixtures for Docker and docker-compose based tests
55
long_description = file: README.md
66
long_description_content_type = text/markdown

0 commit comments

Comments
 (0)