summaryrefslogtreecommitdiff
path: root/parallel
diff options
context:
space:
mode:
authorrodent <rodent>2014-02-18 02:53:37 +0000
committerrodent <rodent>2014-02-18 02:53:37 +0000
commitd28889cd537da7bfd1fabb5d1c1bc274a7952d49 (patch)
tree3bfdda51743b7615cb88a6ba067d4c86ed5fff97 /parallel
parent2c9e7d5e5da3d286f6b24dee0437bcce04d018cb (diff)
downloadpkgsrc-d28889cd537da7bfd1fabb5d1c1bc274a7952d49.tar.gz
Updated to latest release, 3.3.0.16. Some important changes to note:
1) The shared library isn't installed with py33. The package uses a pure python implementation; 2) The connection and reduction functions are installed in different directory names depending on python major version. From CHANGES.txt: 3.3.0.16 - 2014-02-11 --------------------- - Previous release was missing the billiard.py3 package from MANIFEST so the installation would not work on Python 3. 3.3.0.15 - 2014-02-10 --------------------- - Pool: Fixed "cannot join process not started" error. - Now uses billiard.py2 and billiard.py3 specific packages that are installed depending on the python version used. This way the installation will not import version specific modules (and possibly crash). 3.3.0.14 - 2014-01-17 --------------------- - Fixed problem with our backwards compatible ``bytes`` wrapper (Issue #103). - No longer expects frozen applications to have a valid ``__file__`` attribute.
Diffstat (limited to 'parallel')
-rw-r--r--parallel/py-billiard/Makefile16
-rw-r--r--parallel/py-billiard/PLIST31
-rw-r--r--parallel/py-billiard/distinfo8
3 files changed, 29 insertions, 26 deletions
diff --git a/parallel/py-billiard/Makefile b/parallel/py-billiard/Makefile
index db33ec8067d..0c7e5cdb5ce 100644
--- a/parallel/py-billiard/Makefile
+++ b/parallel/py-billiard/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2014/01/19 18:48:00 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2014/02/18 02:53:37 rodent Exp $
-DISTNAME= billiard-3.3.0.13
+DISTNAME= billiard-3.3.0.16
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
CATEGORIES= parallel
MASTER_SITES= https://pypi.python.org/packages/source/b/billiard/
@@ -15,6 +15,18 @@ REPLACE_PYTHON+= funtests/setup.py funtests/tests/test_multiprocessing.py
PYTHON_VERSIONS_INCOMPATIBLE= 26
+.include "../../lang/python/pyversion.mk"
+
+TWO_OR_THREE= ${PYPKGPREFIX:C/([0-9])[0-9]/\1/1}
+PLIST_SUBST+= PY_VER_MAJ=${TWO_OR_THREE}
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+PLIST_VARS+= py2
+.if ${TWO_OR_THREE} != "py3"
+PLIST.py2= yes
+.endif
+
.include "../../lang/python/application.mk"
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/parallel/py-billiard/PLIST b/parallel/py-billiard/PLIST
index 626b7a78579..499cd2549d5 100644
--- a/parallel/py-billiard/PLIST
+++ b/parallel/py-billiard/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2014/01/19 18:48:00 wiz Exp $
-${PLIST.py2x}${PYSITELIB}/_billiard.so
+@comment $NetBSD: PLIST,v 1.4 2014/02/18 02:53:37 rodent Exp $
+${PLIST.py2}${PYSITELIB}/_billiard.so
${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -8,21 +8,9 @@ ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
${PYSITELIB}/billiard/__init__.py
${PYSITELIB}/billiard/__init__.pyc
${PYSITELIB}/billiard/__init__.pyo
-${PYSITELIB}/billiard/_connection.py
-${PYSITELIB}/billiard/_connection.pyc
-${PYSITELIB}/billiard/_connection.pyo
-${PYSITELIB}/billiard/_connection3.py
-${PYSITELIB}/billiard/_connection3.pyc
-${PYSITELIB}/billiard/_connection3.pyo
${PYSITELIB}/billiard/_ext.py
${PYSITELIB}/billiard/_ext.pyc
${PYSITELIB}/billiard/_ext.pyo
-${PYSITELIB}/billiard/_reduction.py
-${PYSITELIB}/billiard/_reduction.pyc
-${PYSITELIB}/billiard/_reduction.pyo
-${PYSITELIB}/billiard/_reduction3.py
-${PYSITELIB}/billiard/_reduction3.pyc
-${PYSITELIB}/billiard/_reduction3.pyo
${PYSITELIB}/billiard/_win.py
${PYSITELIB}/billiard/_win.pyc
${PYSITELIB}/billiard/_win.pyo
@@ -65,6 +53,15 @@ ${PYSITELIB}/billiard/pool.pyo
${PYSITELIB}/billiard/process.py
${PYSITELIB}/billiard/process.pyc
${PYSITELIB}/billiard/process.pyo
+${PYSITELIB}/billiard/${PY_VER_MAJ}/__init__.py
+${PYSITELIB}/billiard/${PY_VER_MAJ}/__init__.pyc
+${PYSITELIB}/billiard/${PY_VER_MAJ}/__init__.pyo
+${PYSITELIB}/billiard/${PY_VER_MAJ}/connection.py
+${PYSITELIB}/billiard/${PY_VER_MAJ}/connection.pyc
+${PYSITELIB}/billiard/${PY_VER_MAJ}/connection.pyo
+${PYSITELIB}/billiard/${PY_VER_MAJ}/reduction.py
+${PYSITELIB}/billiard/${PY_VER_MAJ}/reduction.pyc
+${PYSITELIB}/billiard/${PY_VER_MAJ}/reduction.pyo
${PYSITELIB}/billiard/queues.py
${PYSITELIB}/billiard/queues.pyc
${PYSITELIB}/billiard/queues.pyo
@@ -101,9 +98,3 @@ ${PYSITELIB}/funtests/__init__.pyo
${PYSITELIB}/funtests/setup.py
${PYSITELIB}/funtests/setup.pyc
${PYSITELIB}/funtests/setup.pyo
-${PYSITELIB}/funtests/tests/__init__.py
-${PYSITELIB}/funtests/tests/__init__.pyc
-${PYSITELIB}/funtests/tests/__init__.pyo
-${PYSITELIB}/funtests/tests/test_multiprocessing.py
-${PYSITELIB}/funtests/tests/test_multiprocessing.pyc
-${PYSITELIB}/funtests/tests/test_multiprocessing.pyo
diff --git a/parallel/py-billiard/distinfo b/parallel/py-billiard/distinfo
index 6d8a2f67c32..6f9f16e1e74 100644
--- a/parallel/py-billiard/distinfo
+++ b/parallel/py-billiard/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2013/12/31 13:27:51 rodent Exp $
+$NetBSD: distinfo,v 1.5 2014/02/18 02:53:37 rodent Exp $
-SHA1 (billiard-3.3.0.13.tar.gz) = ca8f1e33b725e0a665df49a6e4789adc6b3bc53e
-RMD160 (billiard-3.3.0.13.tar.gz) = 142126f190f0d29a9b9a68631c415e3b5d44c6ab
-Size (billiard-3.3.0.13.tar.gz) = 148777 bytes
+SHA1 (billiard-3.3.0.16.tar.gz) = e8300652601320de36ad51a66df2fbac66ca174c
+RMD160 (billiard-3.3.0.16.tar.gz) = ac2e88325e366eac38133be6b0d1739ffe7d24d3
+Size (billiard-3.3.0.16.tar.gz) = 150922 bytes