Changes 3.5.0.2:

- max_memory_per_child was measured in kilobytes on Linux, but bytes on
*BSD/MacOS, it's now always kilobytes.

- Windows: Adds support for max_memory_per_child, but requires the
``psutil`` package to be installed.

- Fixed bug in ForkingPickler.loadbuf, where it tried to pass
a BytesIO instance directly to ``pickle.loads`` on Python 2.7.

3 files changed, 42 insertions, 48 deletions

diff --git a/parallel/py-billiard/Makefile b/parallel/py-billiard/Makefile
index b0cebf5e944..fb24435464b 100644
--- a/parallel/py-billiard/Makefile
+++ b/parallel/py-billiard/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2016/06/08 17:43:38 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2017/04/09 16:43:03 adam Exp $
 
-DISTNAME=	billiard-3.3.0.18
+DISTNAME=	billiard-3.5.0.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	parallel
 MASTER_SITES=	${MASTER_SITE_PYPI:=b/billiard/}
@@ -10,13 +10,13 @@ HOMEPAGE=	http://github.com/celery/billiard
 COMMENT=	Python multiprocessing fork with improvements and bugfixes
 LICENSE=	modified-bsd
 
-USE_LANGUAGES+=	c
-REPLACE_PYTHON+=	funtests/setup.py funtests/tests/test_multiprocessing.py
-
 .include "../../lang/python/pyversion.mk"
-
-TWO_OR_THREE=	${PYPKGPREFIX:C/([0-9])[0-9]/\1/1}
-PLIST_SUBST+=	PY_VER_MAJ=${TWO_OR_THREE}
+# builds _billiard.so
+.if "${PYPKGPREFIX}" == "py27"
+USE_LANGUAGES=		c
+.else
+USE_LANGUAGES=		# empty
+.endif
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
diff --git a/parallel/py-billiard/PLIST b/parallel/py-billiard/PLIST
index 4d9e9e9e9cd..dcbc8d583f1 100644
--- a/parallel/py-billiard/PLIST
+++ b/parallel/py-billiard/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2014/02/20 00:47:28 rodent Exp $
-${PLIST.py2x}${PYSITELIB}/_billiard.so
+@comment $NetBSD: PLIST,v 1.6 2017/04/09 16:43:03 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -8,6 +7,7 @@ ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/billiard/__init__.py
 ${PYSITELIB}/billiard/__init__.pyc
 ${PYSITELIB}/billiard/__init__.pyo
+${PLIST.py2x}${PYSITELIB}/_billiard.so
 ${PYSITELIB}/billiard/_ext.py
 ${PYSITELIB}/billiard/_ext.pyc
 ${PYSITELIB}/billiard/_ext.pyo
@@ -23,6 +23,9 @@ ${PYSITELIB}/billiard/compat.pyo
 ${PYSITELIB}/billiard/connection.py
 ${PYSITELIB}/billiard/connection.pyc
 ${PYSITELIB}/billiard/connection.pyo
+${PYSITELIB}/billiard/context.py
+${PYSITELIB}/billiard/context.pyc
+${PYSITELIB}/billiard/context.pyo
 ${PYSITELIB}/billiard/dummy/__init__.py
 ${PYSITELIB}/billiard/dummy/__init__.pyc
 ${PYSITELIB}/billiard/dummy/__init__.pyo
@@ -38,9 +41,9 @@ ${PYSITELIB}/billiard/exceptions.pyo
 ${PYSITELIB}/billiard/five.py
 ${PYSITELIB}/billiard/five.pyc
 ${PYSITELIB}/billiard/five.pyo
-${PYSITELIB}/billiard/forking.py
-${PYSITELIB}/billiard/forking.pyc
-${PYSITELIB}/billiard/forking.pyo
+${PYSITELIB}/billiard/forkserver.py
+${PYSITELIB}/billiard/forkserver.pyc
+${PYSITELIB}/billiard/forkserver.pyo
 ${PYSITELIB}/billiard/heap.py
 ${PYSITELIB}/billiard/heap.pyc
 ${PYSITELIB}/billiard/heap.pyo
@@ -50,51 +53,42 @@ ${PYSITELIB}/billiard/managers.pyo
 ${PYSITELIB}/billiard/pool.py
 ${PYSITELIB}/billiard/pool.pyc
 ${PYSITELIB}/billiard/pool.pyo
+${PYSITELIB}/billiard/popen_fork.py
+${PYSITELIB}/billiard/popen_fork.pyc
+${PYSITELIB}/billiard/popen_fork.pyo
+${PYSITELIB}/billiard/popen_forkserver.py
+${PYSITELIB}/billiard/popen_forkserver.pyc
+${PYSITELIB}/billiard/popen_forkserver.pyo
+${PYSITELIB}/billiard/popen_spawn_posix.py
+${PYSITELIB}/billiard/popen_spawn_posix.pyc
+${PYSITELIB}/billiard/popen_spawn_posix.pyo
+${PYSITELIB}/billiard/popen_spawn_win32.py
+${PYSITELIB}/billiard/popen_spawn_win32.pyc
+${PYSITELIB}/billiard/popen_spawn_win32.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
 ${PYSITELIB}/billiard/reduction.py
 ${PYSITELIB}/billiard/reduction.pyc
 ${PYSITELIB}/billiard/reduction.pyo
+${PYSITELIB}/billiard/resource_sharer.py
+${PYSITELIB}/billiard/resource_sharer.pyc
+${PYSITELIB}/billiard/resource_sharer.pyo
+${PYSITELIB}/billiard/semaphore_tracker.py
+${PYSITELIB}/billiard/semaphore_tracker.pyc
+${PYSITELIB}/billiard/semaphore_tracker.pyo
 ${PYSITELIB}/billiard/sharedctypes.py
 ${PYSITELIB}/billiard/sharedctypes.pyc
 ${PYSITELIB}/billiard/sharedctypes.pyo
+${PYSITELIB}/billiard/spawn.py
+${PYSITELIB}/billiard/spawn.pyc
+${PYSITELIB}/billiard/spawn.pyo
 ${PYSITELIB}/billiard/synchronize.py
 ${PYSITELIB}/billiard/synchronize.pyc
 ${PYSITELIB}/billiard/synchronize.pyo
-${PYSITELIB}/billiard/tests/__init__.py
-${PYSITELIB}/billiard/tests/__init__.pyc
-${PYSITELIB}/billiard/tests/__init__.pyo
-${PYSITELIB}/billiard/tests/compat.py
-${PYSITELIB}/billiard/tests/compat.pyc
-${PYSITELIB}/billiard/tests/compat.pyo
-${PYSITELIB}/billiard/tests/test_common.py
-${PYSITELIB}/billiard/tests/test_common.pyc
-${PYSITELIB}/billiard/tests/test_common.pyo
-${PYSITELIB}/billiard/tests/test_package.py
-${PYSITELIB}/billiard/tests/test_package.pyc
-${PYSITELIB}/billiard/tests/test_package.pyo
-${PYSITELIB}/billiard/tests/utils.py
-${PYSITELIB}/billiard/tests/utils.pyc
-${PYSITELIB}/billiard/tests/utils.pyo
 ${PYSITELIB}/billiard/util.py
 ${PYSITELIB}/billiard/util.pyc
 ${PYSITELIB}/billiard/util.pyo
-${PYSITELIB}/funtests/__init__.py
-${PYSITELIB}/funtests/__init__.pyc
-${PYSITELIB}/funtests/__init__.pyo
-${PYSITELIB}/funtests/setup.py
-${PYSITELIB}/funtests/setup.pyc
-${PYSITELIB}/funtests/setup.pyo
diff --git a/parallel/py-billiard/distinfo b/parallel/py-billiard/distinfo
index 5ff81d1afd5..cb65225b3d8 100644
--- a/parallel/py-billiard/distinfo
+++ b/parallel/py-billiard/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2015/11/02 23:46:13 agc Exp $
+$NetBSD: distinfo,v 1.9 2017/04/09 16:43:03 adam Exp $
 
-SHA1 (billiard-3.3.0.18.tar.gz) = a3690bf6a789f4bd0aacffeb88ba90b24b80a764
-RMD160 (billiard-3.3.0.18.tar.gz) = c5e61e2ee51170d21951f98f5eb07f48ae637cb0
-SHA512 (billiard-3.3.0.18.tar.gz) = 8d62c1b5d3e979926cb416f6a85597cf2a959559e4f07f76f189e70cf585ef55ddbba9506bc50c2f9a88d8aa00684b7468668748edbd0530a72970334b8e2617
-Size (billiard-3.3.0.18.tar.gz) = 150594 bytes
+SHA1 (billiard-3.5.0.2.tar.gz) = 19c7f8aab3402b15fc17760b1eb9e9695522154e
+RMD160 (billiard-3.5.0.2.tar.gz) = 5fd2f87ad024218e8e7b0f0ea12155f3640a4481
+SHA512 (billiard-3.5.0.2.tar.gz) = 581e1ac361324b36d79e280072952e490ef3470709b094f001c579feda54578c8e7b3e5afc93a5f878a6118c56afff7e59e13b3d3f2ccb2564b9b27cc810dae7
+Size (billiard-3.5.0.2.tar.gz) = 157299 bytes