docker/docker-pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2024-06-21 06:56:53 +02:00
Code Issues Releases Wiki Activity

bump some versions, remove unused

Browse Source 
Signed-off-by: Adam Hill <adam@diginc.us>
This commit is contained in:
Adam Hill 2019-12-31 18:02:18 -06:00
parent 3a0b1b197c
commit 8ab895b38a
No known key found for this signature in database
GPG Key ID: 2193804FCA429855
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
requirements.txt
View File

@ -13,7 +13,6 @@ contextlib2==0.6.0.post1
coverage==5.0.1
cryptography==2.8
docker==4.1.0
docker-compose==1.25.0
dockerpty==0.4.1
docopt==0.6.2
enum34==1.1.6
@ -31,7 +30,6 @@ more-itertools==5.0.0
packaging==19.2
paramiko==2.7.1
pathlib2==2.3.5
pkg-resources==0.0.0
pluggy==0.13.1
py==1.8.1
pycparser==2.19
@ -42,12 +40,12 @@ pytest==4.6.8
pytest-cov==2.8.1
pytest-forked==1.1.3
pytest-xdist==1.31.0
PyYAML==3.13
PyYAML==5.2
requests==2.22.0
scandir==1.10.0
six==1.13.0
subprocess32==3.5.4
testinfra==1.5.1
testinfra==3.3.0
texttable==1.6.2
toml==0.10.0
tox==3.14.3

7
test/conftest.py
View File

@ -3,9 +3,8 @@ import pytest
import testinfra
import os
check_output = testinfra.get_backend(
"local://"
).get_module("Command").check_output
local_host = testinfra.get_host('local://')
check_output = local_host.check_output
__version__ = None
dotdot = os.path.abspath(os.path.join(os.path.abspath(__file__), os.pardir, os.pardir))
@ -50,7 +49,7 @@ def DockerGeneric(request, _test_args, _args, _image, _cmd, _entrypoint):
check_output("docker rm -f {}".format(docker_id))
request.addfinalizer(teardown)
docker_container = testinfra.get_backend("docker://" + docker_id)
docker_container = testinfra.backend.get_backend("docker://" + docker_id)
docker_container.id = docker_id
def run_bash(self, command, *args, **kwargs):