mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
dev-python/docker-py: Remove old
Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
@@ -1,3 +1,2 @@
|
||||
DIST docker-py-4.2.0.tar.gz 234304 BLAKE2B 385f7fbfaabd4732a2f3bb074094b9f286ee9c6a543432f9a15fc6a78a595f44e4ddebcb3037ff1df54cb4b8d6aec40d8961fb4f62710a0a3245eb886d830c80 SHA512 df5a450355f11d580568ebb0e80abc967df35f2ae10ce83c4ece85e4cf3e97d9cd15e5f14a2d9a43650a844d9402a8d97370f6e5f615c186b12968379e52fa38
|
||||
DIST docker-py-4.2.1.tar.gz 234562 BLAKE2B 4b554199f3675340602be27395e0194e827ad81dab48500bca0d4858c699e79ac5108f46eae09c3ac6ae1b580498fd5c78f026ecfd8549b938bb5c6e6cccbd94 SHA512 46ab02d4c247d41efa0ca75d3e13f8aef2d3fe4e6d8624c5a98a728f16c58d0dd8de742be710dc2b2f616dc2cc14a7a8796899e94a4b71a00554baeab105330f
|
||||
DIST docker-py-4.2.2.tar.gz 234729 BLAKE2B 06ebe27582ab6a8a61fdf655d01b01495724e03178c2b8291d38425f2678a3d1f826a836a5926ccf65b07c232fba38251cf8f0b1c644334d1b7611adb9d49e84 SHA512 d81f5a6d1cc15dd6d65e65c9e4f24fcae172ce41c8244e13c99adaad8627c9f0eece923d66108951b5e9aaa134e668f317481684b3c2bd51802321d1c4adbab1
|
||||
|
||||
@@ -1,52 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
PYTHON_COMPAT=( python3_{6..9} )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Python client for Docker"
|
||||
HOMEPAGE="https://github.com/docker/docker-py"
|
||||
SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~arm64 x86"
|
||||
IUSE="doc test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
|
||||
>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
|
||||
"
|
||||
DEPEND="
|
||||
test? (
|
||||
${RDEPEND}
|
||||
>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/paramiko-2.4.2[${PYTHON_USEDEP}]
|
||||
>=dev-python/pytest-2.9.1[${PYTHON_USEDEP}]
|
||||
)
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-fix_splitnport.patch
|
||||
)
|
||||
|
||||
distutils_enable_sphinx docs \
|
||||
'dev-python/recommonmark' \
|
||||
'>=dev-python/sphinx-1.4.6'
|
||||
|
||||
src_prepare() {
|
||||
# localhost has a better chance of being in /etc/hosts
|
||||
sed -e 's:socket[.]gethostname():"localhost":' \
|
||||
-i tests/unit/api_test.py || die
|
||||
|
||||
distutils-r1_src_prepare
|
||||
}
|
||||
|
||||
python_test() {
|
||||
pytest -vv tests/unit/ || die "tests failed under ${EPYTHON}"
|
||||
}
|
||||
@@ -1,59 +0,0 @@
|
||||
diff --git a/docker/utils/utils.py b/docker/utils/utils.py
|
||||
index 447760b..3996d08 100644
|
||||
--- a/docker/utils/utils.py
|
||||
+++ b/docker/utils/utils.py
|
||||
@@ -17,10 +17,9 @@ from ..constants import DEFAULT_NPIPE
|
||||
from ..constants import BYTE_UNITS
|
||||
|
||||
if six.PY2:
|
||||
- from urllib import splitnport
|
||||
from urlparse import urlparse
|
||||
else:
|
||||
- from urllib.parse import splitnport, urlparse
|
||||
+ from urllib.parse import urlparse
|
||||
|
||||
|
||||
def create_ipam_pool(*args, **kwargs):
|
||||
@@ -278,7 +277,7 @@ def parse_host(addr, is_win32=False, tls=False):
|
||||
if proto != 'ssh':
|
||||
raise errors.DockerException(
|
||||
'Invalid bind address format: port is required:'
|
||||
- ' {}'.format(addr)
|
||||
+ ' {}://{}'.format(proto, addr)
|
||||
)
|
||||
port = 22
|
||||
|
||||
@@ -295,6 +294,33 @@ def parse_host(addr, is_win32=False, tls=False):
|
||||
return "{}://{}".format(proto, path).rstrip('/')
|
||||
return '{0}://{1}:{2}{3}'.format(proto, host, port, path).rstrip('/')
|
||||
|
||||
+def splitnport(netloc):
|
||||
+ import re
|
||||
+
|
||||
+ host_port_re1 = re.compile(r"^(.*):([0-9]*)$", re.DOTALL)
|
||||
+ host_port_re2 = re.compile(r"^(.*)$", re.DOTALL)
|
||||
+
|
||||
+ host = None
|
||||
+ port = None
|
||||
+
|
||||
+ match = host_port_re1.match(netloc)
|
||||
+
|
||||
+ if match:
|
||||
+ host, port = match.groups()
|
||||
+ else:
|
||||
+ match = host_port_re2.match(netloc)
|
||||
+ if match:
|
||||
+ host = match.groups()[0]
|
||||
+ port = None
|
||||
+
|
||||
+ if host == '':
|
||||
+ host = None
|
||||
+ if port == '':
|
||||
+ port = None
|
||||
+
|
||||
+ port = int(port) if port else 0
|
||||
+
|
||||
+ return host, port or None
|
||||
|
||||
def parse_devices(devices):
|
||||
device_list = []
|
||||
Reference in New Issue
Block a user