# ChangeLog for dev-python/pyzmq
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/ChangeLog,v 1.11 2011/08/30 07:02:25 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/ChangeLog,v 1.12 2011/08/30 07:49:55 djc Exp $
+
+ 30 Aug 2011; Dirkjan Ochtman <djc@gentoo.org> -pyzmq-2.0.10.1.ebuild,
+ -files/pyzmq-2.0.10.1-python-2.7.patch,
+ -files/pyzmq-2.0.10.1-python-3.1.patch,
+ -files/pyzmq-2.0.10.1-python-3.2.patch, -pyzmq-2.1.4.ebuild:
+ Clean up old versions.
*pyzmq-2.1.9 (30 Aug 2011)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-AUX pyzmq-2.0.10.1-python-2.7.patch 4240 RMD160 08f528aae658912bc9ac96c95953361a3467184f SHA1 9726fc0a55c7c1a06ceabdc9240085c61342ddbe SHA256 5043e69791a3bbabf18a2c13e02916ce13f39f9a4af6811ba7c02b7ae31407ff
-AUX pyzmq-2.0.10.1-python-3.1.patch 424 RMD160 b7635fac1a4e32f5c6f41b8394bae7eb79ff32fd SHA1 500b7a6bb8f917fcc48789df7d305eadc6a7425f SHA256 42c300762ecef7a88dbfbb76c283b5eaf28315706f380edc726d1290303189b0
-AUX pyzmq-2.0.10.1-python-3.2.patch 4194 RMD160 7cbc55ec96b05aa557e9124b91a153748fbe6c5c SHA1 e6c411b20cbed54d8c0ac7c80aed9b00843eade5 SHA256 e9a6c9bbcea89b340ea17bace9c912d86d6c0a91f3728c104e1b22c5bfbb2e7f
-DIST pyzmq-2.0.10.1.tar.gz 1381577 RMD160 cf77e189188599ced96e71a51145255e7c295203 SHA1 303155731262997dcf70ec1eb9e6daf858c8af7d SHA256 f6d9d8a16cda85e7ff88ab3a3a6fd718d790c7cfdb3b8d21f27258e8247266fd
-DIST pyzmq-2.1.4.tar.gz 540697 RMD160 2ae2415e364b79457badf2bd023bf0af62c3e4a3 SHA1 719795408e6748b41ffa82783b907c51f71a2d6c SHA256 aeb1084da8bab474ad2469d63bea653c7fbf09a85318df892585a5c9e0832aab
DIST pyzmq-2.1.7.tar.gz 550434 RMD160 40d60bd47e7e4479b8a4d7e595d796b77edb14f2 SHA1 aac337efb9e3fa33a3fdfa288925ee1bc30a92f2 SHA256 bcecc9e6d19e99757528f0957ab0fbb1ac5d9343820ad3386dcb3ca798cbf317
DIST pyzmq-2.1.9.tar.gz 591156 RMD160 6bd0e0694a62e1ef339f1a5fb5ba073d778376fe SHA1 986e05a89607e2a4f55f5efd2375cf72e840e5bb SHA256 e26df6129b2baffb46aff72704c19fa9c9cb74b24010841b3c00201b02f09ef9
-EBUILD pyzmq-2.0.10.1.ebuild 1428 RMD160 f5601da5fa284e22a1cb410deaddebc3174c5150 SHA1 a424053ab3d453248f24bd84568879dc0c40c6c4 SHA256 3b2cff82a6b644dc6d1e4fffa5efdafd8d0923341a6bf9e0892af6b09759c46d
-EBUILD pyzmq-2.1.4.ebuild 1149 RMD160 7933970e85734423072060b3738d2012222ab342 SHA1 9e17761b87ca560d0942d33958bcbde64eee138a SHA256 a231e256c272d601f6bcfb74b6801214f38032ce5601de5bb8ca164b0da2df24
EBUILD pyzmq-2.1.7.ebuild 1048 RMD160 d13e2edf282f9e0b3cd03a9c465272b6c0aedca2 SHA1 dc6dee5895303a20899389654b98ae73f8c0dcee SHA256 60d620f32e1c2cb87bd6e4ec0881e6f58bdf07fef01def23b4efc80d0c4a13ec
EBUILD pyzmq-2.1.9.ebuild 1049 RMD160 e9b7c45259bf7144d3f878e07c9b9bf350adfab1 SHA1 1d19ac2ebd2ac2417b1881f1edd0222a10f90f12 SHA256 11de6a2303ec88f69ecd6797f7f6de1ec19b5f6595913cd829879f6215c2c6b9
-MISC ChangeLog 1691 RMD160 fa3d7c0ac5ad026a81d634533661d7907dc058a6 SHA1 895e512be85d19b80079a8eb2916748160ef69e1 SHA256 b7ed8bc5f98d6dfa3b1b1447a9f5b1952632a9dda742c715ee5cbf0dc7d3ddaf
+MISC ChangeLog 1936 RMD160 36ad7a5db224ef0105b21f529193ded4c4906773 SHA1 7f144c399797d353aa5323b3320519aa2e9475f5 SHA256 d9f6570ecbc69d4b7102eb6a997d2a7c3676f5457181ca8b178dc25026fb5476
MISC metadata.xml 259 RMD160 4b781a038008fac445e4154045f964b64ad59e75 SHA1 9809d89f3360f9f7537c2bb480d6bcbe942c6ea0 SHA256 0fb1da675767b69b5bd240d135effe2fc500e8b997a5f4eed212e5b26d027972
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEAREKAAYFAk5cizgACgkQxeMuLWsGW/tB3wCgrNl1hpCEewMKCTBdbzm1W86T
-SWcAnRoFYhCUD0TDzaC00rNK9aixG6Z+
-=4UbF
+iEYEAREKAAYFAk5clisACgkQxeMuLWsGW/v1hwCgsf5iLF4WAqMnFM8Ld+9CYU4N
+d8YAoLJykVhmhccty2BINQVqpPodSiK9
+=wjrx
-----END PGP SIGNATURE-----
+++ /dev/null
-https://github.com/zeromq/pyzmq/commit/cf38679a8c7c34fcc22c3225767cf6faf2192ffd
-https://github.com/zeromq/pyzmq/commit/deab5827ef218cfccead6af1ba910e0622993e23
-
---- zmq/tests/__init__.py
-+++ zmq/tests/__init__.py
-@@ -28,10 +28,13 @@
- import zmq
-
- try:
-- from nose import SkipTest
-+ from unittest import SkipTest
- except ImportError:
-- class SkipTest(Exception):
-- pass
-+ try:
-+ from nose import SkipTest
-+ except ImportError:
-+ class SkipTest(Exception):
-+ pass
-
- #-----------------------------------------------------------------------------
- # Utilities
---- zmq/tests/test_message.py
-+++ zmq/tests/test_message.py
-@@ -38,8 +38,19 @@
- # Tests
- #-----------------------------------------------------------------------------
-
-+# some useful constants:
-+
- x = 'x'.encode()
-
-+try:
-+ view = memoryview
-+except NameError:
-+ view = buffer
-+
-+rc0 = grc(x)
-+v = view(x)
-+view_rc = grc(x) - rc0
-+
- class TestMessage(BaseZMQTestCase):
-
- def test_above_30(self):
-@@ -93,10 +104,6 @@
-
- def test_lifecycle1(self):
- """Run through a ref counting cycle with a copy."""
-- try:
-- view = memoryview
-- except NameError:
-- view = type(None)
- for i in range(5, 16): # 32, 64,..., 65536
- s = (2**i)*x
- rc = 2
-@@ -108,10 +115,8 @@
- rc += 1
- self.assertEquals(grc(s), rc)
- b = m2.buffer
-- extra = int(isinstance(b,view))
-- # memoryview incs by 2
-- # buffer by 1
-- rc += 1+extra
-+
-+ rc += view_rc
- self.assertEquals(grc(s), rc)
-
- self.assertEquals(s, str(m).encode())
-@@ -122,7 +127,7 @@
- del m2
- rc -= 1
- self.assertEquals(grc(s), rc)
-- rc -= 1+extra
-+ rc -= view_rc
- del b
- self.assertEquals(grc(s), rc)
- del m
-@@ -133,10 +138,6 @@
-
- def test_lifecycle2(self):
- """Run through a different ref counting cycle with a copy."""
-- try:
-- view = memoryview
-- except NameError:
-- view = type(None)
- for i in range(5, 16): # 32, 64,..., 65536
- s = (2**i)*x
- rc = 2
-@@ -148,8 +149,7 @@
- rc += 1
- self.assertEquals(grc(s), rc)
- b = m.buffer
-- extra = int(isinstance(b,view))
-- rc += 1+extra
-+ rc += view_rc
- self.assertEquals(grc(s), rc)
- self.assertEquals(s, str(m).encode())
- self.assertEquals(s, str(m2).encode())
-@@ -161,7 +161,7 @@
- self.assertEquals(grc(s), rc)
- del m
- # m.buffer is kept until m is del'd
-- rc -= 1+extra
-+ rc -= view_rc
- rc -= 1
- self.assertEquals(grc(s), rc)
- del m2
-@@ -203,10 +203,6 @@
-
- def test_buffer_in(self):
- """test using a buffer as input"""
-- try:
-- view = memoryview
-- except NameError:
-- view = buffer
- if unicode is str:
- ins = "§§¶•ªº˜µ¬˚…∆˙åß∂©œ∑´†≈ç√".encode('utf8')
- else:
-@@ -220,10 +216,6 @@
-
- def test_buffer_out(self):
- """receiving buffered output"""
-- try:
-- view = memoryview
-- except NameError:
-- view = buffer
- if unicode is str:
- ins = "§§¶•ªº˜µ¬˚…∆˙åß∂©œ∑´†≈ç√".encode('utf8')
- else:
-@@ -269,8 +261,12 @@
- shape = shapes[:i]
- A = numpy.random.random(shape)
- m = zmq.Message(A)
-- self.assertEquals(A.data, m.buffer)
-- B = numpy.frombuffer(m.buffer,dtype=A.dtype).reshape(A.shape)
-+ if view.__name__ == 'buffer':
-+ self.assertEquals(A.data, m.buffer)
-+ B = numpy.frombuffer(m.buffer,dtype=A.dtype).reshape(A.shape)
-+ else:
-+ self.assertEquals(memoryview(A), m.buffer)
-+ B = numpy.array(m.buffer,dtype=A.dtype).reshape(A.shape)
- self.assertEquals((A==B).all(), True)
-
- def test_memoryview(self):
+++ /dev/null
---- zmq/tests/test_message.py
-+++ zmq/tests/test_message.py
-@@ -256,7 +256,7 @@
- import numpy
- except ImportError:
- raise SkipTest("NumPy unavailable")
-- shapes = map(numpy.random.randint, [2]*5,[16]*5)
-+ shapes = list(map(numpy.random.randint, [2]*5,[16]*5))
- for i in range(1,len(shapes)+1):
- shape = shapes[:i]
- A = numpy.random.random(shape)
+++ /dev/null
-https://github.com/zeromq/pyzmq/commit/c963d9a5aeb26d60026bf3472e98a6337f12330f
-https://github.com/zeromq/pyzmq/commit/7acb75644de0b94fbc4b5fff103395b0a7871d17
-
---- setup.py
-+++ setup.py
-@@ -197,18 +197,17 @@
- return os.path.abspath(pjoin('zmq', subdir, name+'.c'))
-
- czmq = pxd('core', 'czmq')
--allocate = pxd('utils', 'allocate')
- buffers = pxd('utils', 'buffers')
-
- submodules = dict(
- core = {'constants': [czmq],
- 'error':[czmq],
-- 'poll':[czmq, allocate],
-+ 'poll':[czmq],
- 'stopwatch':[czmq],
- 'context':[pxd('core', 'socket'), czmq],
- 'message':[czmq, buffers],
- 'socket':[pxd('core', 'context'), pxd('core', 'message'),
-- czmq, allocate, buffers],
-+ czmq, buffers],
- 'device':[czmq],
- 'version':[czmq],
- },
---- zmq/core/czmq.pxd
-+++ zmq/core/czmq.pxd
-@@ -27,6 +27,9 @@
- # Import the C header files
- #-----------------------------------------------------------------------------
-
-+cdef extern from "allocate.h":
-+ object allocate(size_t n, void **pp)
-+
- cdef extern from "errno.h" nogil:
- enum: ZMQ_EINVAL "EINVAL"
- enum: ZMQ_EAGAIN "EAGAIN"
---- zmq/core/poll.pyx
-+++ zmq/core/poll.pyx
-@@ -23,9 +23,8 @@
- # Imports
- #-----------------------------------------------------------------------------
-
--from czmq cimport zmq_poll, zmq_pollitem_t
-+from czmq cimport zmq_poll, zmq_pollitem_t, allocate
- from socket cimport Socket
--from allocate cimport allocate
-
- import sys
- from zmq.core.error import ZMQError
---- zmq/core/socket.pyx
-+++ zmq/core/socket.pyx
-@@ -32,7 +32,6 @@
- from cpython cimport PyBytes_AsString, PyBytes_Size
- from cpython cimport Py_DECREF, Py_INCREF
-
--from allocate cimport allocate
- from buffers cimport asbuffer_r, frombuffer_r, viewfromobject_r
-
- from czmq cimport *
---- zmq/utils/allocate.h
-+++ zmq/utils/allocate.h
-@@ -0,0 +1,39 @@
-+/*
-+A utility to allocate a C array.
-+
-+This is excerpted from mpi4py's "atimport.h" and is licensed under the BSD license.
-+*/
-+
-+#include "Python.h"
-+
-+static PyObject * allocate(Py_ssize_t n, void **pp){
-+ PyObject *ob;
-+ if (n > PY_SSIZE_T_MAX)
-+ return PyErr_NoMemory();
-+ else if (n < 0) {
-+ PyErr_SetString(PyExc_RuntimeError,
-+ "memory allocation with negative size");
-+ return NULL;
-+ }
-+#if PY_VERSION_HEX >= 0x02060000
-+ ob = PyByteArray_FromStringAndSize(NULL, (n==0) ? 1 : n);
-+ if (ob && n==0 && (PyByteArray_Resize(ob, 0) < 0)) {
-+ Py_DECREF(ob);
-+ return NULL;
-+ }
-+ if (ob && pp)
-+ *pp = (void *)PyByteArray_AS_STRING(ob);
-+#else
-+ {
-+ void *p = PyMem_Malloc(n);
-+ if (!p)
-+ return PyErr_NoMemory();
-+ ob = PyCObject_FromVoidPtr(p, PyMem_Free);
-+ if (!ob)
-+ PyMem_Free(p);
-+ else if (pp)
-+ *pp = p;
-+ }
-+#endif
-+ return ob;
-+}
-\ No newline at end of file
---- zmq/utils/allocate.pxd
-+++ zmq/utils/allocate.pxd
-@@ -1,40 +0,0 @@
--"""A utility to allocate a C array.
--
--This was copied from mpi4py and is licensed under the BSD license.
--"""
--
--from libc.stdlib cimport free, malloc
--
--#-----------------------------------------------------------------------------
--# Python includes.
--#-----------------------------------------------------------------------------
--
--cdef extern from "Python.h":
-- object PyCObject_FromVoidPtr(void *, void (*)(void*))
--
--#-----------------------------------------------------------------------------
--# Main functions.
--#-----------------------------------------------------------------------------
--
--cdef inline void *memnew(size_t n):
-- """malloc a new memory chunk of a given size."""
-- if n == 0: n = 1
-- return malloc(n)
--
--cdef inline void memdel(void *p):
-- """free a chunk of memory allocated with memnew."""
-- if p != NULL: free(p)
--
--cdef inline object allocate(size_t n, void **pp):
-- """A wrapper that allocates a C array, but with Python ref-counting."""
-- cdef object cob
-- cdef void *p = memnew(n)
-- if p == NULL:
-- raise MemoryError()
-- try:
-- cob = PyCObject_FromVoidPtr(p, memdel)
-- except:
-- memdel(p)
-- raise
-- pp[0] = p
-- return cob
+++ /dev/null
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/pyzmq-2.0.10.1.ebuild,v 1.7 2011/03/16 08:31:01 djc Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 *-jython"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils eutils
-
-DESCRIPTION="PyZMQ is a lightweight and super-fast messaging library built on top of the ZeroMQ library"
-HOMEPAGE="http://www.zeromq.org/bindings:python http://pypi.python.org/pypi/pyzmq"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-RDEPEND="net-libs/zeromq"
-# dev-python/cython required only as long as pyzmq-2.0.10.1-python-3.2.patch is applied.
-DEPEND="${RDEPEND}
- dev-python/cython"
-
-DOCS="README.rst"
-PYTHON_MODNAME="zmq"
-
-src_prepare() {
- distutils_src_prepare
- epatch "${FILESDIR}/${P}-python-2.7.patch"
- epatch "${FILESDIR}/${P}-python-3.1.patch"
- epatch "${FILESDIR}/${P}-python-3.2.patch"
-}
-
-src_test() {
- testing() {
- PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" nosetests -sv $(ls -d build-${PYTHON_ABI}/lib.*)
- }
- python_execute_function testing
-}
-
-src_install() {
- distutils_src_install
- if use doc; then
- dohtml -r docs/build/html/* || die "Installation of documentation failed"
- fi
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
+++ /dev/null
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/pyzmq-2.1.4.ebuild,v 1.1 2011/05/02 12:27:09 djc Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 *-jython"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils eutils
-
-DESCRIPTION="PyZMQ is a lightweight and super-fast messaging library built on top of the ZeroMQ library"
-HOMEPAGE="http://www.zeromq.org/bindings:python http://pypi.python.org/pypi/pyzmq"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-RDEPEND=">=net-libs/zeromq-2.1"
-DEPEND="${RDEPEND}"
-
-DOCS="README.rst"
-PYTHON_MODNAME="zmq"
-
-src_test() {
- testing() {
- PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" nosetests -sv $(ls -d build-${PYTHON_ABI}/lib.*)
- }
- python_execute_function testing
-}
-
-src_install() {
- distutils_src_install
- if use doc; then
- dohtml -r docs/build/html/* || die "Installation of documentation failed"
- fi
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
projects / gentoo.git / commitdiff