Skip to content

Commit

Permalink
Merge pull request #111 from tox-dev/docker5
Browse files Browse the repository at this point in the history
configure to test with docker 5.x
  • Loading branch information
dcrosta authored Sep 1, 2021
2 parents 8f04d1e + e0e18e1 commit 6256950
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ repos:
rev: 21.8b0
hooks:
- id: black
language_version: python3.7
language_version: python3
5 changes: 4 additions & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
jobs:
- job: 'Test'
pool:
vmImage: 'ubuntu-16.04'
vmImage: 'ubuntu-latest'
strategy:
matrix:
Python39:
Expand All @@ -20,6 +20,9 @@ jobs:
versionSpec: '$(python.version)'
architecture: 'x64'

- script: ./ci.sh tox-3.x docker-5.x
displayName: 'Tox 3.x, Docker 5.x'

- script: ./ci.sh tox-3.x docker-4.x
displayName: 'Tox 3.x, Docker 4.x'

Expand Down
1 change: 1 addition & 0 deletions docker-5.x
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
docker>=5.0,<6.0
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
maintainer="Dan Crosta",
maintainer_email="[email protected]",
install_requires=[
"docker>=2.3.0,<5.0",
"docker>=2.3.0,<6.0",
"tox>=3.0.0,<4.0",
],
packages=["tox_docker"],
Expand Down

0 comments on commit 6256950

Please sign in to comment.