From 4d502c8ff7b39ab48526cfbb430073e0a6fcec26 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Skutnik Date: Mon, 30 Jan 2023 15:20:04 -0800 Subject: Update `py-docker` package (#35217) * Add py-docker@5: * [@spackbot] updating style on behalf of spoutn1k * Ignore `tls` variant * Update var/spack/repos/builtin/packages/py-docker/package.py Co-authored-by: Adam J. Stewart * `py-docker`: `py-paramiko` version fix --------- Co-authored-by: spoutn1k Co-authored-by: Adam J. Stewart --- var/spack/repos/builtin/packages/py-docker/package.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-docker/package.py b/var/spack/repos/builtin/packages/py-docker/package.py index e07fe6274a..0fbeecc68b 100644 --- a/var/spack/repos/builtin/packages/py-docker/package.py +++ b/var/spack/repos/builtin/packages/py-docker/package.py @@ -13,10 +13,21 @@ class PyDocker(PythonPackage): homepage = "https://github.com/docker/docker-py" pypi = "docker/docker-4.2.1.tar.gz" + version("6.0.1", sha256="896c4282e5c7af5c45e8b683b0b0c33932974fe6e50fc6906a0a83616ab3da97") + version("5.0.3", sha256="d916a26b62970e7c2f554110ed6af04c7ccff8e9f81ad17d0d40c75637e227fb") version("4.2.1", sha256="380a20d38fbfaa872e96ee4d0d23ad9beb0f9ed57ff1c30653cbeb0c9c0964f2") - depends_on("python@2.7:2.8,3.5:", type=("build", "run")) + variant("ssh", default=False, description="Required to use docker-py over SSH") + depends_on("py-setuptools", type="build") - depends_on("py-six@1.4.0:", type=("build", "run")) + depends_on("py-setuptools@45:", when="@6:", type="build") + depends_on("py-setuptools-scm+toml@6.2:", when="@6:", type="build") + depends_on("py-six@1.4.0:", when="@4.2.1", type=("build", "run")) depends_on("py-websocket-client@0.32.0:", type=("build", "run")) depends_on("py-requests@2.14.2:2.17,2.18.1:", type=("build", "run")) + depends_on("py-requests@2.26.0:", when="@6:", type=("build", "run")) + depends_on("py-packaging@14.0:", when="@6:", type=("build", "run")) + depends_on("py-urllib3@1.26.0:", when="@6:", type=("build", "run")) + + depends_on("py-paramiko@2.4.3:", when="@6:+ssh", type=("build", "run")) + depends_on("py-paramiko@2.4.2:", when="+ssh", type=("build", "run")) -- cgit v1.2.3-70-g09d2