1 |
commit: 3017df87274e91b0919ad8ebaaf757c556db960e |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Aug 5 15:07:17 2020 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 5 15:07:24 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3017df87 |
7 |
|
8 |
dev-python/docker-py: Remove old |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-python/docker-py/Manifest | 1 - |
13 |
dev-python/docker-py/docker-py-4.2.0-r1.ebuild | 52 ------------------- |
14 |
.../files/docker-py-4.2.0-fix_splitnport.patch | 59 ---------------------- |
15 |
3 files changed, 112 deletions(-) |
16 |
|
17 |
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest |
18 |
index 10b9b4e65f5..bad92bb3a39 100644 |
19 |
--- a/dev-python/docker-py/Manifest |
20 |
+++ b/dev-python/docker-py/Manifest |
21 |
@@ -1,3 +1,2 @@ |
22 |
-DIST docker-py-4.2.0.tar.gz 234304 BLAKE2B 385f7fbfaabd4732a2f3bb074094b9f286ee9c6a543432f9a15fc6a78a595f44e4ddebcb3037ff1df54cb4b8d6aec40d8961fb4f62710a0a3245eb886d830c80 SHA512 df5a450355f11d580568ebb0e80abc967df35f2ae10ce83c4ece85e4cf3e97d9cd15e5f14a2d9a43650a844d9402a8d97370f6e5f615c186b12968379e52fa38 |
23 |
DIST docker-py-4.2.1.tar.gz 234562 BLAKE2B 4b554199f3675340602be27395e0194e827ad81dab48500bca0d4858c699e79ac5108f46eae09c3ac6ae1b580498fd5c78f026ecfd8549b938bb5c6e6cccbd94 SHA512 46ab02d4c247d41efa0ca75d3e13f8aef2d3fe4e6d8624c5a98a728f16c58d0dd8de742be710dc2b2f616dc2cc14a7a8796899e94a4b71a00554baeab105330f |
24 |
DIST docker-py-4.2.2.tar.gz 234729 BLAKE2B 06ebe27582ab6a8a61fdf655d01b01495724e03178c2b8291d38425f2678a3d1f826a836a5926ccf65b07c232fba38251cf8f0b1c644334d1b7611adb9d49e84 SHA512 d81f5a6d1cc15dd6d65e65c9e4f24fcae172ce41c8244e13c99adaad8627c9f0eece923d66108951b5e9aaa134e668f317481684b3c2bd51802321d1c4adbab1 |
25 |
|
26 |
diff --git a/dev-python/docker-py/docker-py-4.2.0-r1.ebuild b/dev-python/docker-py/docker-py-4.2.0-r1.ebuild |
27 |
deleted file mode 100644 |
28 |
index b730b40c98f..00000000000 |
29 |
--- a/dev-python/docker-py/docker-py-4.2.0-r1.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,52 +0,0 @@ |
32 |
-# Copyright 1999-2020 Gentoo Authors |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
- |
35 |
-EAPI=7 |
36 |
-PYTHON_COMPAT=( python3_{6..9} ) |
37 |
- |
38 |
-inherit distutils-r1 |
39 |
- |
40 |
-DESCRIPTION="Python client for Docker" |
41 |
-HOMEPAGE="https://github.com/docker/docker-py" |
42 |
-SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
43 |
- |
44 |
-LICENSE="Apache-2.0" |
45 |
-SLOT="0" |
46 |
-KEYWORDS="amd64 ~arm64 x86" |
47 |
-IUSE="doc test" |
48 |
-RESTRICT="!test? ( test )" |
49 |
- |
50 |
-RDEPEND=" |
51 |
- !~dev-python/requests-2.18.0[${PYTHON_USEDEP}] |
52 |
- >=dev-python/requests-2.14.2[${PYTHON_USEDEP}] |
53 |
- >=dev-python/six-1.4.0[${PYTHON_USEDEP}] |
54 |
- >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}] |
55 |
-" |
56 |
-DEPEND=" |
57 |
- test? ( |
58 |
- ${RDEPEND} |
59 |
- >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] |
60 |
- >=dev-python/paramiko-2.4.2[${PYTHON_USEDEP}] |
61 |
- >=dev-python/pytest-2.9.1[${PYTHON_USEDEP}] |
62 |
- ) |
63 |
-" |
64 |
- |
65 |
-PATCHES=( |
66 |
- "${FILESDIR}"/${P}-fix_splitnport.patch |
67 |
-) |
68 |
- |
69 |
-distutils_enable_sphinx docs \ |
70 |
- 'dev-python/recommonmark' \ |
71 |
- '>=dev-python/sphinx-1.4.6' |
72 |
- |
73 |
-src_prepare() { |
74 |
- # localhost has a better chance of being in /etc/hosts |
75 |
- sed -e 's:socket[.]gethostname():"localhost":' \ |
76 |
- -i tests/unit/api_test.py || die |
77 |
- |
78 |
- distutils-r1_src_prepare |
79 |
-} |
80 |
- |
81 |
-python_test() { |
82 |
- pytest -vv tests/unit/ || die "tests failed under ${EPYTHON}" |
83 |
-} |
84 |
|
85 |
diff --git a/dev-python/docker-py/files/docker-py-4.2.0-fix_splitnport.patch b/dev-python/docker-py/files/docker-py-4.2.0-fix_splitnport.patch |
86 |
deleted file mode 100644 |
87 |
index 6eda63459dd..00000000000 |
88 |
--- a/dev-python/docker-py/files/docker-py-4.2.0-fix_splitnport.patch |
89 |
+++ /dev/null |
90 |
@@ -1,59 +0,0 @@ |
91 |
-diff --git a/docker/utils/utils.py b/docker/utils/utils.py |
92 |
-index 447760b..3996d08 100644 |
93 |
---- a/docker/utils/utils.py |
94 |
-+++ b/docker/utils/utils.py |
95 |
-@@ -17,10 +17,9 @@ from ..constants import DEFAULT_NPIPE |
96 |
- from ..constants import BYTE_UNITS |
97 |
- |
98 |
- if six.PY2: |
99 |
-- from urllib import splitnport |
100 |
- from urlparse import urlparse |
101 |
- else: |
102 |
-- from urllib.parse import splitnport, urlparse |
103 |
-+ from urllib.parse import urlparse |
104 |
- |
105 |
- |
106 |
- def create_ipam_pool(*args, **kwargs): |
107 |
-@@ -278,7 +277,7 @@ def parse_host(addr, is_win32=False, tls=False): |
108 |
- if proto != 'ssh': |
109 |
- raise errors.DockerException( |
110 |
- 'Invalid bind address format: port is required:' |
111 |
-- ' {}'.format(addr) |
112 |
-+ ' {}://{}'.format(proto, addr) |
113 |
- ) |
114 |
- port = 22 |
115 |
- |
116 |
-@@ -295,6 +294,33 @@ def parse_host(addr, is_win32=False, tls=False): |
117 |
- return "{}://{}".format(proto, path).rstrip('/') |
118 |
- return '{0}://{1}:{2}{3}'.format(proto, host, port, path).rstrip('/') |
119 |
- |
120 |
-+def splitnport(netloc): |
121 |
-+ import re |
122 |
-+ |
123 |
-+ host_port_re1 = re.compile(r"^(.*):([0-9]*)$", re.DOTALL) |
124 |
-+ host_port_re2 = re.compile(r"^(.*)$", re.DOTALL) |
125 |
-+ |
126 |
-+ host = None |
127 |
-+ port = None |
128 |
-+ |
129 |
-+ match = host_port_re1.match(netloc) |
130 |
-+ |
131 |
-+ if match: |
132 |
-+ host, port = match.groups() |
133 |
-+ else: |
134 |
-+ match = host_port_re2.match(netloc) |
135 |
-+ if match: |
136 |
-+ host = match.groups()[0] |
137 |
-+ port = None |
138 |
-+ |
139 |
-+ if host == '': |
140 |
-+ host = None |
141 |
-+ if port == '': |
142 |
-+ port = None |
143 |
-+ |
144 |
-+ port = int(port) if port else 0 |
145 |
-+ |
146 |
-+ return host, port or None |
147 |
- |
148 |
- def parse_devices(devices): |
149 |
- device_list = [] |