[Python-modules-commits] [billiard] 01/07: Import billiard_3.3.0.21.orig.tar.gz
Brian May
bam at moszumanska.debian.org
Wed Nov 18 22:06:23 UTC 2015
This is an automated email from the git hooks/post-receive script.
bam pushed a commit to branch master
in repository billiard.
commit 04f4cd56873c7d80995137920fb03b5a9f28d966
Author: Brian May <bam at debian.org>
Date: Thu Nov 19 08:27:18 2015 +1100
Import billiard_3.3.0.21.orig.tar.gz
---
CHANGES.txt | 7 ++++++
PKG-INFO | 13 ++++++++---
README.rst | 2 +-
billiard.egg-info/PKG-INFO | 13 ++++++++---
billiard/__init__.py | 40 +++++++++++++++-------------------
billiard/dummy/__init__.py | 12 +++++-----
billiard/dummy/connection.py | 3 +--
billiard/five.py | 2 +-
billiard/managers.py | 4 ++--
billiard/pool.py | 24 +++++++++++---------
billiard/process.py | 4 ++--
billiard/py2/connection.py | 3 +--
billiard/py2/reduction.py | 4 ++--
billiard/py3/connection.py | 9 ++++----
billiard/queues.py | 4 ++--
billiard/synchronize.py | 8 +++----
funtests/tests/test_multiprocessing.py | 2 +-
setup.cfg | 3 +++
setup.py | 7 ++++--
19 files changed, 95 insertions(+), 69 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 92b828e..ee7934d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,10 @@
+3.3.0.21 - 2015-10-26
+---------------------
+
+- Pool: Fixed semaphore error on Python3.
+
+- Fixed libSystem error on OS X El Capitan.
+
3.3.0.20 - 2015-04-17
---------------------
diff --git a/PKG-INFO b/PKG-INFO
index 600d52d..a863d2e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,15 +1,15 @@
Metadata-Version: 1.1
Name: billiard
-Version: 3.3.0.20
+Version: 3.3.0.21
Summary: Python multiprocessing fork with improvements and bugfixes
Home-page: http://github.com/celery/billiard
-Author: Ask Solem',
+Author: Ask Solem
Author-email: ask at celeryproject.org
License: BSD
Description: ========
billiard
========
- :version: 3.3.0.19
+ :version: 3.3.0.21
About
-----
@@ -50,6 +50,13 @@ Description: ========
Changes
===========
+ 3.3.0.21 - 2015-10-26
+ ---------------------
+
+ - Pool: Fixed semaphore error on Python3.
+
+ - Fixed libSystem error on OS X El Capitan.
+
3.3.0.20 - 2015-04-17
---------------------
diff --git a/README.rst b/README.rst
index b982cd1..8bf8a2e 100644
--- a/README.rst
+++ b/README.rst
@@ -1,7 +1,7 @@
========
billiard
========
-:version: 3.3.0.19
+:version: 3.3.0.21
About
-----
diff --git a/billiard.egg-info/PKG-INFO b/billiard.egg-info/PKG-INFO
index 600d52d..a863d2e 100644
--- a/billiard.egg-info/PKG-INFO
+++ b/billiard.egg-info/PKG-INFO
@@ -1,15 +1,15 @@
Metadata-Version: 1.1
Name: billiard
-Version: 3.3.0.20
+Version: 3.3.0.21
Summary: Python multiprocessing fork with improvements and bugfixes
Home-page: http://github.com/celery/billiard
-Author: Ask Solem',
+Author: Ask Solem
Author-email: ask at celeryproject.org
License: BSD
Description: ========
billiard
========
- :version: 3.3.0.19
+ :version: 3.3.0.21
About
-----
@@ -50,6 +50,13 @@ Description: ========
Changes
===========
+ 3.3.0.21 - 2015-10-26
+ ---------------------
+
+ - Pool: Fixed semaphore error on Python3.
+
+ - Fixed libSystem error on OS X El Capitan.
+
3.3.0.20 - 2015-04-17
---------------------
diff --git a/billiard/__init__.py b/billiard/__init__.py
index a37249d..dff7256 100644
--- a/billiard/__init__.py
+++ b/billiard/__init__.py
@@ -19,11 +19,27 @@
from __future__ import absolute_import
-VERSION = (3, 3, 0, 20)
+import os
+import sys
+import warnings
+
+from .exceptions import ( # noqa
+ ProcessError,
+ BufferTooShort,
+ TimeoutError,
+ AuthenticationError,
+ TimeLimitExceeded,
+ SoftTimeLimitExceeded,
+ WorkerLostError,
+)
+from .process import Process, current_process, active_children
+from .util import SUBDEBUG, SUBWARNING
+
+VERSION = (3, 3, 0, 21)
__version__ = '.'.join(map(str, VERSION[0:4])) + "".join(VERSION[4:])
__author__ = 'R Oudkerk / Python Software Foundation'
__author_email__ = 'python-dev at python.org'
-__maintainer__ = 'Ask Solem',
+__maintainer__ = 'Ask Solem'
__contact__ = "ask at celeryproject.org"
__homepage__ = "http://github.com/celery/billiard"
__docformat__ = "restructuredtext"
@@ -40,26 +56,6 @@ __all__ = [
'forking_enable', 'forking_is_enabled'
]
-#
-# Imports
-#
-
-import os
-import sys
-import warnings
-
-from .exceptions import ( # noqa
- ProcessError,
- BufferTooShort,
- TimeoutError,
- AuthenticationError,
- TimeLimitExceeded,
- SoftTimeLimitExceeded,
- WorkerLostError,
-)
-from .process import Process, current_process, active_children
-from .util import SUBDEBUG, SUBWARNING
-
def ensure_multiprocessing():
from ._ext import ensure_multiprocessing
diff --git a/billiard/dummy/__init__.py b/billiard/dummy/__init__.py
index 369b6a8..e6e78a6 100644
--- a/billiard/dummy/__init__.py
+++ b/billiard/dummy/__init__.py
@@ -33,12 +33,6 @@
#
from __future__ import absolute_import
-__all__ = [
- 'Process', 'current_process', 'active_children', 'freeze_support',
- 'Lock', 'RLock', 'Semaphore', 'BoundedSemaphore', 'Condition',
- 'Event', 'Queue', 'Manager', 'Pipe', 'Pool', 'JoinableQueue'
-]
-
#
# Imports
#
@@ -55,6 +49,12 @@ from billiard.five import Queue
from billiard.connection import Pipe
+__all__ = [
+ 'Process', 'current_process', 'active_children', 'freeze_support',
+ 'Lock', 'RLock', 'Semaphore', 'BoundedSemaphore', 'Condition',
+ 'Event', 'Queue', 'Manager', 'Pipe', 'Pool', 'JoinableQueue'
+]
+
class DummyProcess(threading.Thread):
diff --git a/billiard/dummy/connection.py b/billiard/dummy/connection.py
index 46502ee..6bf6b9d 100644
--- a/billiard/dummy/connection.py
+++ b/billiard/dummy/connection.py
@@ -33,10 +33,9 @@
#
from __future__ import absolute_import
-__all__ = ['Client', 'Listener', 'Pipe']
-
from billiard.five import Queue
+__all__ = ['Client', 'Listener', 'Pipe']
families = [None]
diff --git a/billiard/five.py b/billiard/five.py
index 56f0c80..ec0287c 100644
--- a/billiard/five.py
+++ b/billiard/five.py
@@ -39,7 +39,7 @@ if sys.version_info < (3, 3):
if SYSTEM == 'Darwin':
import ctypes
from ctypes.util import find_library
- libSystem = ctypes.CDLL('libSystem.dylib')
+ libSystem = ctypes.CDLL(find_library('libSystem.dylib'))
CoreServices = ctypes.CDLL(find_library('CoreServices'),
use_errno=True)
mach_absolute_time = libSystem.mach_absolute_time
diff --git a/billiard/managers.py b/billiard/managers.py
index 8764441..f08ba7f 100644
--- a/billiard/managers.py
+++ b/billiard/managers.py
@@ -9,8 +9,6 @@
#
from __future__ import absolute_import
-__all__ = ['BaseManager', 'SyncManager', 'BaseProxy', 'Token']
-
#
# Imports
#
@@ -28,6 +26,8 @@ from .forking import exit, Popen
from .reduction import ForkingPickler
from .util import Finalize, error, info
+__all__ = ['BaseManager', 'SyncManager', 'BaseProxy', 'Token']
+
#
# Register some things for pickling
#
diff --git a/billiard/pool.py b/billiard/pool.py
index 1bbef7d..f2e2d11 100644
--- a/billiard/pool.py
+++ b/billiard/pool.py
@@ -162,16 +162,6 @@ class LaxBoundedSemaphore(_Semaphore):
_Semaphore.__init__(self, value, verbose)
self._initial_value = value
- def grow(self):
- if PY3:
- cond = self._cond
- else:
- cond = self._Semaphore__cond
- with cond:
- self._initial_value += 1
- self._Semaphore__value += 1
- cond.notify()
-
def shrink(self):
self._initial_value -= 1
self.acquire()
@@ -188,8 +178,22 @@ class LaxBoundedSemaphore(_Semaphore):
def clear(self):
while self._value < self._initial_value:
_Semaphore.release(self)
+
+ def grow(self):
+ with self._cond:
+ self._initial_value += 1
+ self._value += 1
+ self._cond.notify()
+
else:
+ def grow(self):
+ cond = self._Semaphore__cond
+ with cond:
+ self._initial_value += 1
+ self._Semaphore__value += 1
+ cond.notify()
+
def release(self): # noqa
cond = self._Semaphore__cond
with cond:
diff --git a/billiard/process.py b/billiard/process.py
index f3d01d1..a6080ff 100644
--- a/billiard/process.py
+++ b/billiard/process.py
@@ -8,8 +8,6 @@
#
from __future__ import absolute_import
-__all__ = ['Process', 'current_process', 'active_children']
-
#
# Imports
#
@@ -36,6 +34,8 @@ try:
except OSError:
ORIGINAL_DIR = None
+__all__ = ['Process', 'current_process', 'active_children']
+
#
# Public functions
#
diff --git a/billiard/py2/connection.py b/billiard/py2/connection.py
index 1c6a534..b1227cf 100644
--- a/billiard/py2/connection.py
+++ b/billiard/py2/connection.py
@@ -9,8 +9,6 @@
from __future__ import absolute_import
-__all__ = ['Client', 'Listener', 'Pipe']
-
import os
import random
import sys
@@ -35,6 +33,7 @@ try:
except NameError:
WindowsError = None # noqa
+__all__ = ['Client', 'Listener', 'Pipe']
# global set later
xmlrpclib = None
diff --git a/billiard/py2/reduction.py b/billiard/py2/reduction.py
index b6cde35..4810006 100644
--- a/billiard/py2/reduction.py
+++ b/billiard/py2/reduction.py
@@ -10,8 +10,6 @@
from __future__ import absolute_import
-__all__ = []
-
import os
import sys
import socket
@@ -32,6 +30,8 @@ if not(is_win32 or is_pypy or is_py3k or hasattr(_billiard, 'recvfd')):
close = win32.CloseHandle if sys.platform == 'win32' else os.close
+__all__ = []
+
# globals set later
_listener = None
_lock = None
diff --git a/billiard/py3/connection.py b/billiard/py3/connection.py
index b83b5fb..385ef72 100644
--- a/billiard/py3/connection.py
+++ b/billiard/py3/connection.py
@@ -8,8 +8,6 @@
#
from __future__ import absolute_import
-__all__ = ['Client', 'Listener', 'Pipe', 'wait']
-
import io
import os
import sys
@@ -26,6 +24,7 @@ from ..exceptions import AuthenticationError, BufferTooShort
from ..five import monotonic
from ..util import get_temp_dir, Finalize, sub_debug
from ..reduction import ForkingPickler
+
try:
import _winapi
from _winapi import (
@@ -47,6 +46,8 @@ except ImportError:
raise
_winapi = None
+__all__ = ['Client', 'Listener', 'Pipe', 'wait']
+
#
#
#
@@ -456,8 +457,8 @@ class Listener(object):
connections, or for a Windows named pipe.
'''
def __init__(self, address=None, family=None, backlog=1, authkey=None):
- family = (family or (address and address_type(address))
- or default_family)
+ family = (family or (address and address_type(address)) or
+ default_family)
address = address or arbitrary_address(family)
_validate_family(family)
diff --git a/billiard/queues.py b/billiard/queues.py
index c3d15ff..bd0a328 100644
--- a/billiard/queues.py
+++ b/billiard/queues.py
@@ -8,8 +8,6 @@
#
from __future__ import absolute_import
-__all__ = ['Queue', 'SimpleQueue', 'JoinableQueue']
-
import sys
import os
import threading
@@ -26,6 +24,8 @@ from .util import debug, error, info, Finalize, register_after_fork
from .five import Empty, Full
from .forking import assert_spawning
+__all__ = ['Queue', 'SimpleQueue', 'JoinableQueue']
+
class Queue(object):
'''
diff --git a/billiard/synchronize.py b/billiard/synchronize.py
index 1e8a321..45fdbcc 100644
--- a/billiard/synchronize.py
+++ b/billiard/synchronize.py
@@ -8,10 +8,6 @@
#
from __future__ import absolute_import
-__all__ = [
- 'Lock', 'RLock', 'Semaphore', 'BoundedSemaphore', 'Condition', 'Event',
-]
-
import itertools
import os
import signal
@@ -26,6 +22,10 @@ from .util import Finalize, register_after_fork, debug
from .forking import assert_spawning, Popen
from .compat import bytes, closerange
+__all__ = [
+ 'Lock', 'RLock', 'Semaphore', 'BoundedSemaphore', 'Condition', 'Event',
+]
+
# Try to import the mp.synchronize module cleanly, if it fails
# raise ImportError for platforms lacking a working sem_open implementation.
# See issue 3770
diff --git a/funtests/tests/test_multiprocessing.py b/funtests/tests/test_multiprocessing.py
index f97a6dc..c703e29 100644
--- a/funtests/tests/test_multiprocessing.py
+++ b/funtests/tests/test_multiprocessing.py
@@ -1100,7 +1100,7 @@ class _TestZZZNumberOfObjects(BaseTestCase):
self.assertEqual(refs, EXPECTED_NUMBER)
# Test of creating a customized manager class
-from billiard.managers import BaseManager, BaseProxy, RemoteError
+from billiard.managers import BaseManager, BaseProxy, RemoteError # noqa
class FooBar(object):
diff --git a/setup.cfg b/setup.cfg
index 18c34dc..5bbc372 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,9 @@
[nosetests]
where = billiard/tests
+[wheel]
+universal = 0
+
[egg_info]
tag_build =
tag_date = 0
diff --git a/setup.py b/setup.py
index 6c4e658..138975e 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,7 @@
from __future__ import print_function
import os
+import re
import sys
import glob
@@ -49,11 +50,13 @@ extras = {}
# -*- Distribution Meta -*-
-import re
re_meta = re.compile(r'__(\w+?)__\s*=\s*(.*)')
re_vers = re.compile(r'VERSION\s*=\s*\((.*?)\)')
re_doc = re.compile(r'^"""(.+?)"""')
-rq = lambda s: s.strip("\"'")
+
+
+def rq(s):
+ return s.strip("\"'")
def add_default(m):
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/billiard.git
More information about the Python-modules-commits
mailing list