Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/lockfile/files/, dev-python/lockfile/
Date: Mon, 02 Nov 2015 11:51:01
Message-Id: 1446464832.28f2c3f85113ade9e521953b6b8998d00602eec6.jlec@gentoo
1 commit: 28f2c3f85113ade9e521953b6b8998d00602eec6
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 1 17:20:22 2015 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 2 11:47:12 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28f2c3f8
7
8 dev-python/lockfile: Drop old
9
10 obsoletes:
11
12 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=536240
13
14 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=560752
15
16 Package-Manager: portage-2.2.23
17 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
18
19 dev-python/lockfile/Manifest | 2 -
20 dev-python/lockfile/files/py3-support.patch | 107 --------------------------
21 dev-python/lockfile/lockfile-0.10.2.ebuild | 43 -----------
22 dev-python/lockfile/lockfile-0.11.0-r1.ebuild | 2 +-
23 dev-python/lockfile/lockfile-0.9.1-r1.ebuild | 43 -----------
24 5 files changed, 1 insertion(+), 196 deletions(-)
25
26 diff --git a/dev-python/lockfile/Manifest b/dev-python/lockfile/Manifest
27 index bfa50c8..4be3a3c 100644
28 --- a/dev-python/lockfile/Manifest
29 +++ b/dev-python/lockfile/Manifest
30 @@ -1,3 +1 @@
31 -DIST lockfile-0.10.2.tar.gz 20662 SHA256 9e42252f17d1dd89ee31745e0c4fbe58862c25147eb0ef5295c9cd9bcb4ea2c1 SHA512 7d70bcf7c343228f144687dd2cbc47a525034a68134fa626077d08308e6abce80559e36e9f65859d4c46873c712f62e1d6bb2aeec422d337332b65caf2e430a8 WHIRLPOOL d23a0b99da2304d9c884e69df7fbae4e507d7bab35fe450f2062aba44b4c85fd2c1585012cd02a56c886b50c44fb5a470afe13546f828297c498c3a8551eda86
32 DIST lockfile-0.11.0.tar.gz 20909 SHA256 eed7e0c829135aaaf2a9df83652bc6e2cc50175d933741c25aac0394674e7fd3 SHA512 6c4c69e1434194076a99f8134a2558c791675d420a17687dfd5b38c1303564392ecc388ec285d55a20027bcbcbc1b3475a489b70390796c46346b89d4b18ad89 WHIRLPOOL 3fe41cec5f22109ce17e249a02469201e74cc6facd18bbcd5d6b75984f1f72e66d36eab68772d9bc6aa0c1ef6597f3bdf8f8757d9f867323d152cca8a47a445f
33 -DIST lockfile-0.9.1.tar.gz 16949 SHA256 88d8ea8d435ee5691117a87d1ca8fed2f8da881eb145295bf6895ac2c416e95d SHA512 1f7e2b13c42df730339e653a361bf4b85a289d62ed9277f159ab454b1e951d922884086299912472236ce0772d5eceebab7e0c6407590bb2ccbe9c56b664de05 WHIRLPOOL 543bc9ad7e937feba52c6132eee3356a9a229c8866f4f605f8399343a676fc98f62bf33f121c4f8dcbac8e18f38168561d34119efea5e30b53427a7e7283055d
34
35 diff --git a/dev-python/lockfile/files/py3-support.patch b/dev-python/lockfile/files/py3-support.patch
36 deleted file mode 100644
37 index ca6349a..0000000
38 --- a/dev-python/lockfile/files/py3-support.patch
39 +++ /dev/null
40 @@ -1,107 +0,0 @@
41 -# https://github.com/smontanaro/pylockfile/commit/379fa0b6131995f96f5bd048906fc0bd3c2527f7
42 -# https://github.com/smontanaro/pylockfile/commit/eeead7d35e9a97b457b90edd241fd031df68d57b
43 -# https://github.com/smontanaro/pylockfile/commit/bf2627a5b9f83e1bbcf1b5030a693acb6236a211
44 ---- a/lockfile/__init__.py
45 -+++ b/lockfile/__init__.py
46 -@@ -1,4 +1,3 @@
47 --
48 - """
49 - lockfile.py - Platform-independent advisory file locks.
50 -
51 -@@ -50,6 +49,8 @@ Exceptions:
52 - NotMyLock - File was locked but not by the current thread/process
53 - """
54 -
55 -+from __future__ import absolute_import
56 -+
57 - import sys
58 - import socket
59 - import os
60 -@@ -257,7 +258,7 @@ def LinkFileLock(*args, **kwds):
61 - Do not use in new code. Instead, import LinkLockFile from the
62 - lockfile.linklockfile module.
63 - """
64 -- import linklockfile
65 -+ from . import linklockfile
66 - return _fl_helper(linklockfile.LinkLockFile, "lockfile.linklockfile",
67 - *args, **kwds)
68 -
69 -@@ -267,7 +268,7 @@ def MkdirFileLock(*args, **kwds):
70 - Do not use in new code. Instead, import MkdirLockFile from the
71 - lockfile.mkdirlockfile module.
72 - """
73 -- import mkdirlockfile
74 -+ from . import mkdirlockfile
75 - return _fl_helper(mkdirlockfile.MkdirLockFile, "lockfile.mkdirlockfile",
76 - *args, **kwds)
77 -
78 -@@ -277,7 +278,7 @@ def SQLiteFileLock(*args, **kwds):
79 - Do not use in new code. Instead, import SQLiteLockFile from the
80 - lockfile.mkdirlockfile module.
81 - """
82 -- import sqlitelockfile
83 -+ from . import sqlitelockfile
84 - return _fl_helper(sqlitelockfile.SQLiteLockFile, "lockfile.sqlitelockfile",
85 - *args, **kwds)
86 -
87 -@@ -306,10 +307,10 @@ def locked(path, timeout=None):
88 - return decor
89 -
90 - if hasattr(os, "link"):
91 -- import linklockfile as _llf
92 -+ from . import linklockfile as _llf
93 - LockFile = _llf.LinkLockFile
94 - else:
95 -- import mkdirlockfile as _mlf
96 -+ from . import mkdirlockfile as _mlf
97 - LockFile = _mlf.MkdirLockFile
98 -
99 - FileLock = LockFile
100 -diff --git a/lockfile/pidlockfile.py b/lockfile/pidlockfile.py
101 -index 3fc8f63..a965ba8 100644
102 ---- a/lockfile/pidlockfile.py
103 -+++ b/lockfile/pidlockfile.py
104 -@@ -78,7 +78,7 @@ class PIDLockFile(LockBase):
105 - while True:
106 - try:
107 - write_pid_to_pidfile(self.path)
108 -- except OSError, exc:
109 -+ except OSError as exc:
110 - if exc.errno == errno.EEXIST:
111 - # The lock creation failed. Maybe sleep a bit.
112 - if timeout is not None and time.time() > end_time:
113 -@@ -159,7 +159,7 @@ def write_pid_to_pidfile(pidfile_path):
114 -
115 - """
116 - open_flags = (os.O_CREAT | os.O_EXCL | os.O_WRONLY)
117 -- open_mode = 0644
118 -+ open_mode = 0o644
119 - pidfile_fd = os.open(pidfile_path, open_flags, open_mode)
120 - pidfile = os.fdopen(pidfile_fd, 'w')
121 -
122 -@@ -186,7 +186,7 @@ def remove_existing_pidfile(pidfile_path):
123 - """
124 - try:
125 - os.remove(pidfile_path)
126 -- except OSError, exc:
127 -+ except OSError as exc:
128 - if exc.errno == errno.ENOENT:
129 - pass
130 - else:
131 -diff --git a/lockfile/sqlitelockfile.py b/lockfile/sqlitelockfile.py
132 -index ec75490..d596229 100644
133 ---- a/lockfile/sqlitelockfile.py
134 -+++ b/lockfile/sqlitelockfile.py
135 -@@ -3,6 +3,11 @@ from __future__ import absolute_import, division
136 - import time
137 - import os
138 -
139 -+try:
140 -+ unicode
141 -+except NameError:
142 -+ unicode = str
143 -+
144 - from . import LockBase, NotLocked, NotMyLock, LockTimeout, AlreadyLocked
145 -
146 - class SQLiteLockFile(LockBase):
147 -
148
149 diff --git a/dev-python/lockfile/lockfile-0.10.2.ebuild b/dev-python/lockfile/lockfile-0.10.2.ebuild
150 deleted file mode 100644
151 index 288009b..0000000
152 --- a/dev-python/lockfile/lockfile-0.10.2.ebuild
153 +++ /dev/null
154 @@ -1,43 +0,0 @@
155 -# Copyright 1999-2015 Gentoo Foundation
156 -# Distributed under the terms of the GNU General Public License v2
157 -# $Id$
158 -
159 -EAPI=5
160 -
161 -PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
162 -
163 -inherit distutils-r1
164 -
165 -DESCRIPTION="Platform-independent file locking module"
166 -HOMEPAGE="https://launchpad.net/pylockfile https://pypi.python.org/pypi/lockfile"
167 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
168 -
169 -LICENSE="MIT"
170 -SLOT="0"
171 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
172 -IUSE="doc test"
173 -
174 -DEPEND="
175 - dev-python/pbr[${PYTHON_USEDEP}]
176 - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
177 - test? ( dev-python/nose[${PYTHON_USEDEP}] )"
178 -RDEPEND=""
179 -
180 -DOCS=( ACKS README RELEASE-NOTES )
181 -
182 -python_compile_all() {
183 - if use doc; then
184 - einfo "Generation of documentation"
185 - emake -C doc/source html || die "Generation of documentation failed"
186 - fi
187 -}
188 -
189 -python_test() {
190 - # "${PYTHON}" test/test_lockfile.py yeilds no informative coverage output
191 - nosetests || die "test_lockfile failed under ${EPYTHON}"
192 -}
193 -
194 -python_install_all() {
195 - use doc && local HTML_DOCS=( doc/source/.build/html/. )
196 - distutils-r1_python_install_all
197 -}
198
199 diff --git a/dev-python/lockfile/lockfile-0.11.0-r1.ebuild b/dev-python/lockfile/lockfile-0.11.0-r1.ebuild
200 index 1979687..e55dad9 100644
201 --- a/dev-python/lockfile/lockfile-0.11.0-r1.ebuild
202 +++ b/dev-python/lockfile/lockfile-0.11.0-r1.ebuild
203 @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
204
205 LICENSE="MIT"
206 SLOT="0"
207 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
208 +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
209 IUSE="doc test"
210
211 DEPEND="
212
213 diff --git a/dev-python/lockfile/lockfile-0.9.1-r1.ebuild b/dev-python/lockfile/lockfile-0.9.1-r1.ebuild
214 deleted file mode 100644
215 index 321426e..0000000
216 --- a/dev-python/lockfile/lockfile-0.9.1-r1.ebuild
217 +++ /dev/null
218 @@ -1,43 +0,0 @@
219 -# Copyright 1999-2015 Gentoo Foundation
220 -# Distributed under the terms of the GNU General Public License v2
221 -# $Id$
222 -
223 -EAPI=5
224 -# py2.5 dropped; Test file reveals py2.5 can't support a core file
225 -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
226 -
227 -inherit distutils-r1
228 -
229 -DESCRIPTION="Platform-independent file locking module"
230 -HOMEPAGE="https://code.google.com/p/pylockfile/ https://pypi.python.org/pypi/lockfile http://smontanaro.dyndns.org/python/"
231 -SRC_URI="https://pylockfile.googlecode.com/files/${P}.tar.gz"
232 -
233 -LICENSE="MIT"
234 -SLOT="0"
235 -KEYWORDS="amd64 arm ppc ~sparc x86"
236 -IUSE="doc test"
237 -
238 -DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
239 - test? ( dev-python/nose[${PYTHON_USEDEP}] )"
240 -RDEPEND=""
241 -
242 -DOCS=( ACKS README RELEASE-NOTES )
243 -
244 -PATCHES=( "${FILESDIR}"/py3-support.patch )
245 -
246 -python_compile_all() {
247 - if use doc; then
248 - einfo "Generation of documentation"
249 - emake -C doc html || die "Generation of documentation failed"
250 - fi
251 -}
252 -
253 -python_test() {
254 - # "${PYTHON}" test/test_lockfile.py yeilds no informative coverage output
255 - nosetests || die "test_lockfile failed under ${EPYTHON}"
256 -}
257 -
258 -python_install_all() {
259 - use doc && local HTML_DOCS=( doc/.build/html/. )
260 - distutils-r1_python_install_all
261 -}