Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Luminaar authored Jul 28, 2022
2 parents d6b7de4 + e53a7e0 commit 3beb54f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Changelog

## Unreleased
Changes:
## Version 1.0.0
Breaking changes:
- Default behavior is not to install `docker-compose` at all when
installing `pytest-docker` with PIP. If you want to, you install
`pytest-docker` with the `docker-compose-v1` extra (`pip install
pytest-docker[docker-compose-v1]`).
installing `pytest-docker` with PIP. Use the `docker-compose-v1` extra.

Feat:
- Add support for Docker Compose v2 via a new pytest fixture,
`docker_compose_command` that should return `docker compose`.

Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = pytest-docker
version = 0.13.0
version = 1.0.0
description = Simple pytest fixtures for Docker and docker-compose based tests
long_description = file: README.md
long_description_content_type = text/markdown
Expand Down

0 comments on commit 3beb54f

Please sign in to comment.