From 8c268f47cebf84a0399868aa1618417f62dd0f1b Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 1 Jun 2023 09:26:15 +0100 Subject: [PATCH] Bump to `docker==6.1.2` Signed-off-by: Pedro Algarvio --- requirements/static/ci/py3.10/darwin.txt | 4 +- requirements/static/ci/py3.10/freebsd.txt | 4 +- requirements/static/ci/py3.10/linux.txt | 4 +- requirements/static/ci/py3.10/pkgtests.txt | 2 +- requirements/static/ci/py3.10/windows.txt | 9 ++- requirements/static/ci/py3.11/darwin.txt | 4 +- requirements/static/ci/py3.11/freebsd.txt | 4 +- requirements/static/ci/py3.11/linux.txt | 4 +- requirements/static/ci/py3.11/windows.txt | 9 ++- requirements/static/ci/py3.8/freebsd.txt | 4 +- requirements/static/ci/py3.8/linux.txt | 4 +- requirements/static/ci/py3.8/windows.txt | 9 ++- requirements/static/ci/py3.9/darwin.txt | 4 +- requirements/static/ci/py3.9/freebsd.txt | 4 +- requirements/static/ci/py3.9/linux.txt | 4 +- requirements/static/ci/py3.9/windows.txt | 9 ++- .../unit/modules/dockermod/test_module.py | 57 ++++++------------- 17 files changed, 66 insertions(+), 73 deletions(-) diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index 07dc8abe8163..b38369e57c4a 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -116,7 +116,7 @@ dnspython==2.3.0 # via # -r requirements/static/ci/common.in # python-etcd -docker==5.0.3 +docker==6.1.2 # via # -r requirements/static/ci/common.in # pytest-salt-factories @@ -263,6 +263,7 @@ packaging==23.1 # via # -c requirements/static/ci/../pkg/py3.10/darwin.txt # -r requirements/base.txt + # docker # pytest paramiko==2.10.1 # via @@ -490,6 +491,7 @@ urllib3==1.26.6 # via # -c requirements/static/ci/../pkg/py3.10/darwin.txt # botocore + # docker # kubernetes # python-etcd # requests diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt index fd85ee1c905d..0c736d73313d 100644 --- a/requirements/static/ci/py3.10/freebsd.txt +++ b/requirements/static/ci/py3.10/freebsd.txt @@ -114,7 +114,7 @@ dnspython==2.3.0 # via # -r requirements/static/ci/common.in # python-etcd -docker==5.0.3 +docker==6.1.2 # via # -r requirements/static/ci/common.in # pytest-salt-factories @@ -259,6 +259,7 @@ packaging==23.1 # via # -c requirements/static/ci/../pkg/py3.10/freebsd.txt # -r requirements/base.txt + # docker # pytest paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin" # via @@ -486,6 +487,7 @@ urllib3==1.26.6 # via # -c requirements/static/ci/../pkg/py3.10/freebsd.txt # botocore + # docker # kubernetes # python-etcd # requests diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index 77a47d094eef..e7b70b0c665e 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -123,7 +123,7 @@ dnspython==2.3.0 # via # -r requirements/static/ci/common.in # python-etcd -docker==5.0.3 +docker==6.1.2 # via # -r requirements/static/ci/common.in # pytest-salt-factories @@ -270,6 +270,7 @@ packaging==23.1 # -c requirements/static/ci/../pkg/py3.10/linux.txt # -r requirements/base.txt # ansible-core + # docker # pytest paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin" # via @@ -534,6 +535,7 @@ urllib3==1.26.6 # via # -c requirements/static/ci/../pkg/py3.10/linux.txt # botocore + # docker # kubernetes # python-etcd # requests diff --git a/requirements/static/ci/py3.10/pkgtests.txt b/requirements/static/ci/py3.10/pkgtests.txt index ebdb1bfbac49..0febfc93b492 100644 --- a/requirements/static/ci/py3.10/pkgtests.txt +++ b/requirements/static/ci/py3.10/pkgtests.txt @@ -33,7 +33,7 @@ distro==1.8.0 # via # -r requirements/base.txt # pytest-skip-markers -docker==5.0.3 +docker==6.1.2 # via -r requirements/static/ci/pkgtests.in exceptiongroup==1.1.0 # via pytest diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt index ab3e1f7553df..4ee2f505d13c 100644 --- a/requirements/static/ci/py3.10/windows.txt +++ b/requirements/static/ci/py3.10/windows.txt @@ -107,9 +107,7 @@ dnspython==2.3.0 # via # -r requirements/static/ci/common.in # python-etcd -docker-pycreds==0.4.0 - # via docker -docker==2.7.0 +docker==6.1.2 # via -r requirements/static/ci/common.in etcd3-py==0.1.6 # via -r requirements/static/ci/common.in @@ -240,6 +238,7 @@ packaging==23.1 # via # -c requirements/static/ci/../pkg/py3.10/windows.txt # -r requirements/base.txt + # docker # pytest passlib[bcrypt]==1.7.4 # via -r requirements/static/ci/common.in @@ -369,6 +368,7 @@ pywin32==306 # via # -c requirements/static/ci/../pkg/py3.10/windows.txt # -r requirements/windows.txt + # docker # pytest-skip-markers # wmi pywinrm==0.4.1 @@ -421,8 +421,6 @@ six==1.15.0 # via # -c requirements/static/ci/../pkg/py3.10/windows.txt # cassandra-driver - # docker - # docker-pycreds # etcd3-py # genshi # geomet @@ -470,6 +468,7 @@ urllib3==1.26.6 # -c requirements/static/ci/../pkg/py3.10/windows.txt # -r requirements/windows.txt # botocore + # docker # kubernetes # python-etcd # requests diff --git a/requirements/static/ci/py3.11/darwin.txt b/requirements/static/ci/py3.11/darwin.txt index 72496006eb68..cced5f69269c 100644 --- a/requirements/static/ci/py3.11/darwin.txt +++ b/requirements/static/ci/py3.11/darwin.txt @@ -112,7 +112,7 @@ dnspython==2.3.0 # via # -r requirements/static/ci/common.in # python-etcd -docker==5.0.3 +docker==6.1.2 # via # -r requirements/static/ci/common.in # pytest-salt-factories @@ -246,6 +246,7 @@ packaging==23.1 # via # -c requirements/static/ci/../pkg/py3.11/darwin.txt # -r requirements/base.txt + # docker # pytest passlib[bcrypt]==1.7.4 # via -r requirements/static/ci/common.in @@ -450,6 +451,7 @@ urllib3==1.26.6 # via # -c requirements/static/ci/../pkg/py3.11/darwin.txt # botocore + # docker # kubernetes # python-etcd # requests diff --git a/requirements/static/ci/py3.11/freebsd.txt b/requirements/static/ci/py3.11/freebsd.txt index 0bf4c27f753a..1a514980d7ae 100644 --- a/requirements/static/ci/py3.11/freebsd.txt +++ b/requirements/static/ci/py3.11/freebsd.txt @@ -114,7 +114,7 @@ dnspython==2.3.0 # via # -r requirements/static/ci/common.in # python-etcd -docker==5.0.3 +docker==6.1.2 # via # -r requirements/static/ci/common.in # pytest-salt-factories @@ -246,6 +246,7 @@ packaging==23.1 # via # -c requirements/static/ci/../pkg/py3.11/freebsd.txt # -r requirements/base.txt + # docker # pytest paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin" # via -r requirements/static/ci/common.in @@ -454,6 +455,7 @@ urllib3==1.26.6 # via # -c requirements/static/ci/../pkg/py3.11/freebsd.txt # botocore + # docker # kubernetes # python-etcd # requests diff --git a/requirements/static/ci/py3.11/linux.txt b/requirements/static/ci/py3.11/linux.txt index 24976932e729..0f3f73e87c76 100644 --- a/requirements/static/ci/py3.11/linux.txt +++ b/requirements/static/ci/py3.11/linux.txt @@ -123,7 +123,7 @@ dnspython==2.3.0 # via # -r requirements/static/ci/common.in # python-etcd -docker==5.0.3 +docker==6.1.2 # via # -r requirements/static/ci/common.in # pytest-salt-factories @@ -257,6 +257,7 @@ packaging==23.1 # -c requirements/static/ci/../pkg/py3.11/linux.txt # -r requirements/base.txt # ansible-core + # docker # pytest paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin" # via -r requirements/static/ci/common.in @@ -502,6 +503,7 @@ urllib3==1.26.6 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # botocore + # docker # kubernetes # python-etcd # requests diff --git a/requirements/static/ci/py3.11/windows.txt b/requirements/static/ci/py3.11/windows.txt index 200cd49a27d4..43f09619481f 100644 --- a/requirements/static/ci/py3.11/windows.txt +++ b/requirements/static/ci/py3.11/windows.txt @@ -107,9 +107,7 @@ dnspython==2.3.0 # via # -r requirements/static/ci/common.in # python-etcd -docker-pycreds==0.4.0 - # via docker -docker==2.7.0 +docker==6.1.2 # via -r requirements/static/ci/common.in etcd3-py==0.1.6 # via -r requirements/static/ci/common.in @@ -238,6 +236,7 @@ packaging==23.1 # via # -c requirements/static/ci/../pkg/py3.11/windows.txt # -r requirements/base.txt + # docker # pytest passlib[bcrypt]==1.7.4 # via -r requirements/static/ci/common.in @@ -367,6 +366,7 @@ pywin32==306 # via # -c requirements/static/ci/../pkg/py3.11/windows.txt # -r requirements/windows.txt + # docker # pytest-skip-markers # wmi pywinrm==0.4.1 @@ -419,8 +419,6 @@ six==1.15.0 # via # -c requirements/static/ci/../pkg/py3.11/windows.txt # cassandra-driver - # docker - # docker-pycreds # etcd3-py # genshi # geomet @@ -466,6 +464,7 @@ urllib3==1.26.6 # -c requirements/static/ci/../pkg/py3.11/windows.txt # -r requirements/windows.txt # botocore + # docker # kubernetes # python-etcd # requests diff --git a/requirements/static/ci/py3.8/freebsd.txt b/requirements/static/ci/py3.8/freebsd.txt index a487185c263a..0eac16dfc7bd 100644 --- a/requirements/static/ci/py3.8/freebsd.txt +++ b/requirements/static/ci/py3.8/freebsd.txt @@ -120,7 +120,7 @@ dnspython==2.3.0 # -r requirements/static/ci/common.in # ciscoconfparse # python-etcd -docker==5.0.3 +docker==6.1.2 # via # -r requirements/static/ci/common.in # pytest-salt-factories @@ -286,6 +286,7 @@ packaging==23.1 # via # -c requirements/static/ci/../pkg/py3.8/freebsd.txt # -r requirements/base.txt + # docker # pytest paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin" # via @@ -533,6 +534,7 @@ urllib3==1.26.6 # via # -c requirements/static/ci/../pkg/py3.8/freebsd.txt # botocore + # docker # kubernetes # python-etcd # requests diff --git a/requirements/static/ci/py3.8/linux.txt b/requirements/static/ci/py3.8/linux.txt index 757082881886..28e87212c647 100644 --- a/requirements/static/ci/py3.8/linux.txt +++ b/requirements/static/ci/py3.8/linux.txt @@ -129,7 +129,7 @@ dnspython==2.3.0 # -r requirements/static/ci/common.in # ciscoconfparse # python-etcd -docker==5.0.3 +docker==6.1.2 # via # -r requirements/static/ci/common.in # pytest-salt-factories @@ -297,6 +297,7 @@ packaging==23.1 # -c requirements/static/ci/../pkg/py3.8/linux.txt # -r requirements/base.txt # ansible-core + # docker # pytest paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin" # via @@ -582,6 +583,7 @@ urllib3==1.26.6 # via # -c requirements/static/ci/../pkg/py3.8/linux.txt # botocore + # docker # kubernetes # python-etcd # requests diff --git a/requirements/static/ci/py3.8/windows.txt b/requirements/static/ci/py3.8/windows.txt index e6a12da70a03..66b5e055e973 100644 --- a/requirements/static/ci/py3.8/windows.txt +++ b/requirements/static/ci/py3.8/windows.txt @@ -109,9 +109,7 @@ dnspython==2.3.0 # via # -r requirements/static/ci/common.in # python-etcd -docker-pycreds==0.4.0 - # via docker -docker==2.7.0 +docker==6.1.2 # via -r requirements/static/ci/common.in etcd3-py==0.1.6 # via -r requirements/static/ci/common.in @@ -246,6 +244,7 @@ packaging==23.1 # via # -c requirements/static/ci/../pkg/py3.8/windows.txt # -r requirements/base.txt + # docker # pytest passlib[bcrypt]==1.7.4 # via -r requirements/static/ci/common.in @@ -376,6 +375,7 @@ pywin32==306 # -c requirements/static/ci/../pkg/py3.8/windows.txt # -r requirements/windows.txt # cherrypy + # docker # pytest-skip-markers # wmi pywinrm==0.4.1 @@ -428,8 +428,6 @@ six==1.15.0 # via # -c requirements/static/ci/../pkg/py3.8/windows.txt # cassandra-driver - # docker - # docker-pycreds # etcd3-py # genshi # geomet @@ -478,6 +476,7 @@ urllib3==1.26.6 # -c requirements/static/ci/../pkg/py3.8/windows.txt # -r requirements/windows.txt # botocore + # docker # kubernetes # python-etcd # requests diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index 307548dce85e..602a41998d16 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -122,7 +122,7 @@ dnspython==2.3.0 # -r requirements/static/ci/common.in # ciscoconfparse # python-etcd -docker==5.0.3 +docker==6.1.2 # via # -r requirements/static/ci/common.in # pytest-salt-factories @@ -286,6 +286,7 @@ packaging==23.1 # via # -c requirements/static/ci/../pkg/py3.9/darwin.txt # -r requirements/base.txt + # docker # pytest paramiko==2.10.1 # via @@ -534,6 +535,7 @@ urllib3==1.26.6 # via # -c requirements/static/ci/../pkg/py3.9/darwin.txt # botocore + # docker # kubernetes # python-etcd # requests diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt index ccc9ea76b63b..54c9eb197af7 100644 --- a/requirements/static/ci/py3.9/freebsd.txt +++ b/requirements/static/ci/py3.9/freebsd.txt @@ -120,7 +120,7 @@ dnspython==2.3.0 # -r requirements/static/ci/common.in # ciscoconfparse # python-etcd -docker==5.0.3 +docker==6.1.2 # via # -r requirements/static/ci/common.in # pytest-salt-factories @@ -282,6 +282,7 @@ packaging==23.1 # via # -c requirements/static/ci/../pkg/py3.9/freebsd.txt # -r requirements/base.txt + # docker # pytest paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin" # via @@ -530,6 +531,7 @@ urllib3==1.26.6 # via # -c requirements/static/ci/../pkg/py3.9/freebsd.txt # botocore + # docker # kubernetes # python-etcd # requests diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index 080167444262..297cbdcc1ba3 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -131,7 +131,7 @@ dnspython==2.3.0 # -r requirements/static/ci/common.in # ciscoconfparse # python-etcd -docker==5.0.3 +docker==6.1.2 # via # -r requirements/static/ci/common.in # pytest-salt-factories @@ -295,6 +295,7 @@ packaging==23.1 # -c requirements/static/ci/../pkg/py3.9/linux.txt # -r requirements/base.txt # ansible-core + # docker # pytest paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin" # via @@ -580,6 +581,7 @@ urllib3==1.26.6 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt # botocore + # docker # kubernetes # python-etcd # requests diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt index 3ed15fe88fba..fcaeaa3ee593 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/requirements/static/ci/py3.9/windows.txt @@ -109,9 +109,7 @@ dnspython==2.3.0 # via # -r requirements/static/ci/common.in # python-etcd -docker-pycreds==0.4.0 - # via docker -docker==2.7.0 +docker==6.1.2 # via -r requirements/static/ci/common.in etcd3-py==0.1.6 # via -r requirements/static/ci/common.in @@ -242,6 +240,7 @@ packaging==23.1 # via # -c requirements/static/ci/../pkg/py3.9/windows.txt # -r requirements/base.txt + # docker # pytest passlib[bcrypt]==1.7.4 # via -r requirements/static/ci/common.in @@ -372,6 +371,7 @@ pywin32==306 # -c requirements/static/ci/../pkg/py3.9/windows.txt # -r requirements/windows.txt # cherrypy + # docker # pytest-skip-markers # wmi pywinrm==0.4.1 @@ -424,8 +424,6 @@ six==1.15.0 # via # -c requirements/static/ci/../pkg/py3.9/windows.txt # cassandra-driver - # docker - # docker-pycreds # etcd3-py # genshi # geomet @@ -474,6 +472,7 @@ urllib3==1.26.6 # -c requirements/static/ci/../pkg/py3.9/windows.txt # -r requirements/windows.txt # botocore + # docker # kubernetes # python-etcd # requests diff --git a/tests/pytests/unit/modules/dockermod/test_module.py b/tests/pytests/unit/modules/dockermod/test_module.py index 8fb780649767..abfd101540df 100644 --- a/tests/pytests/unit/modules/dockermod/test_module.py +++ b/tests/pytests/unit/modules/dockermod/test_module.py @@ -9,14 +9,19 @@ import salt.loader import salt.modules.dockermod as docker_mod import salt.utils.platform +import salt.utils.versions from salt.exceptions import CommandExecutionError, SaltInvocationError from tests.support.mock import MagicMock, Mock, call, patch log = logging.getLogger(__name__) -pytest.importorskip( +docker = pytest.importorskip( "docker", reason="The python 'docker' package must be installed to run these tests" ) +docker_older_than_1_5_0_skip_marker = pytest.mark.skipif( + salt.utils.versions.Version(docker.__version__) < "1.5.0", + reason="docker module must be installed to run this test or is too old. <=1.5.0", +) @pytest.fixture @@ -354,10 +359,7 @@ def config_get_enabled(val, default): mine_mock.assert_called_once() -@pytest.mark.skipif( - docker_mod.docker.version_info < (1, 5, 0), - reason="docker module must be installed to run this test or is too old. >=1.5.0", -) +@docker_older_than_1_5_0_skip_marker def test_list_networks(): """ test list networks. @@ -378,10 +380,7 @@ def test_list_networks(): client.networks.assert_called_once_with(names=["foo"], ids=["01234"]) -@pytest.mark.skipif( - docker_mod.docker.version_info < (1, 5, 0), - reason="docker module must be installed to run this test or is too old. >=1.5.0", -) +@docker_older_than_1_5_0_skip_marker def test_create_network(): """ test create network. @@ -422,10 +421,7 @@ def test_create_network(): ) -@pytest.mark.skipif( - docker_mod.docker.version_info < (1, 5, 0), - reason="docker module must be installed to run this test or is too old. >=1.5.0", -) +@docker_older_than_1_5_0_skip_marker def test_remove_network(): """ test remove network. @@ -444,10 +440,7 @@ def test_remove_network(): client.remove_network.assert_called_once_with("foo") -@pytest.mark.skipif( - docker_mod.docker.version_info < (1, 5, 0), - reason="docker module must be installed to run this test or is too old. >=1.5.0", -) +@docker_older_than_1_5_0_skip_marker def test_inspect_network(): """ test inspect network. @@ -466,10 +459,7 @@ def test_inspect_network(): client.inspect_network.assert_called_once_with("foo") -@pytest.mark.skipif( - docker_mod.docker.version_info < (1, 5, 0), - reason="docker module must be installed to run this test or is too old. >=1.5.0", -) +@docker_older_than_1_5_0_skip_marker def test_connect_container_to_network(): """ test connect_container_to_network @@ -491,10 +481,7 @@ def test_connect_container_to_network(): client.connect_container_to_network.assert_called_once_with("container", "foo") -@pytest.mark.skipif( - docker_mod.docker.version_info < (1, 5, 0), - reason="docker module must be installed to run this test or is too old. >=1.5.0", -) +@docker_older_than_1_5_0_skip_marker def test_disconnect_container_from_network(): """ test disconnect_container_from_network @@ -513,10 +500,7 @@ def test_disconnect_container_from_network(): client.disconnect_container_from_network.assert_called_once_with("container", "foo") -@pytest.mark.skipif( - docker_mod.docker.version_info < (1, 5, 0), - reason="docker module must be installed to run this test or is too old. >=1.5.0", -) +@docker_older_than_1_5_0_skip_marker def test_list_volumes(): """ test list volumes. @@ -539,10 +523,7 @@ def test_list_volumes(): ) -@pytest.mark.skipif( - docker_mod.docker.version_info < (1, 5, 0), - reason="docker module must be installed to run this test or is too old. >=1.5.0", -) +@docker_older_than_1_5_0_skip_marker def test_create_volume(): """ test create volume. @@ -569,10 +550,7 @@ def test_create_volume(): ) -@pytest.mark.skipif( - docker_mod.docker.version_info < (1, 5, 0), - reason="docker module must be installed to run this test or is too old. >=1.5.0", -) +@docker_older_than_1_5_0_skip_marker def test_remove_volume(): """ test remove volume. @@ -591,10 +569,7 @@ def test_remove_volume(): client.remove_volume.assert_called_once_with("foo") -@pytest.mark.skipif( - docker_mod.docker.version_info < (1, 5, 0), - reason="docker module must be installed to run this test or is too old. >=1.5.0", -) +@docker_older_than_1_5_0_skip_marker def test_inspect_volume(): """ test inspect volume.