<pre style='margin:0'>
Mark Moll (mamoll) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/59b489a53006246465c5d1e53244d7560009e6d8">https://github.com/macports/macports-ports/commit/59b489a53006246465c5d1e53244d7560009e6d8</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 59b489a53006246465c5d1e53244d7560009e6d8
</span>Author: Mark Moll <mmoll@macports.org>
AuthorDate: Wed Aug 22 09:13:04 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-celery: update to version 4.2.1, add patch from upstream for python37
</span>---
python/py-celery/Portfile | 12 +++--
python/py-celery/files/patch-async.diff | 90 +++++++++++++++++++++++++++++++++
2 files changed, 99 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-celery/Portfile b/python/py-celery/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fc5606e..ebf3c92 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-celery/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-celery/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup python 1.0
</span> PortGroup select 1.0
name py-celery
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.2.1
</span> revision 0
categories-append devel
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,10 +26,16 @@ master_sites pypi:[string index ${python.rootname} 0]/${python.rootname}
</span>
distname ${python.rootname}-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 39c21d70a99c055ab45d8c41bee4cca723bda818 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 77ff3730198d6a17b3c1f05579ebe570b579efb35f6d7e13dba3b1368d068b35
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 36d9697dbc2c312ed0ae65b43e121db1c4980afd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 77dab4677e24dc654d42dfbdfed65fa760455b6bb563a0877ecc35f4cfcfc678 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1364075
</span>
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # upstream patch that can be deleted after the next version update
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-async.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/celery/backends/async.py ${worksrcpath}/celery/backends/asynchronous.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> # celery depends on pkg_resources from setuptools
depends_lib-append port:py${python.version}-setuptools \
port:py${python.version}-kombu \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-celery/files/patch-async.diff b/python/py-celery/files/patch-async.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..0e1aa08
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-celery/files/patch-async.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,90 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git celery/backends/redis.py celery/backends/redis.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 012db0f36e..6c311d8273 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- celery/backends/redis.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ celery/backends/redis.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,7 +19,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from celery.utils.log import get_logger
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from celery.utils.time import humanize_seconds
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-from . import async, base
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++from .asynchronous import AsyncBackendMixin, BaseResultConsumer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++from .base import BaseKeyValueStoreBackend
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from urllib.parse import unquote
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -74,7 +75,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ logger = get_logger(__name__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-class ResultConsumer(async.BaseResultConsumer):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++class ResultConsumer(BaseResultConsumer):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _pubsub = None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def __init__(self, *args, **kwargs):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -138,7 +139,7 @@ def cancel_for(self, task_id):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self._pubsub.unsubscribe(key)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-class RedisBackend(base.BaseKeyValueStoreBackend, async.AsyncBackendMixin):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++class RedisBackend(BaseKeyValueStoreBackend, AsyncBackendMixin):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ """Redis task result store."""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ResultConsumer = ResultConsumer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git celery/backends/rpc.py celery/backends/rpc.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6e31cef75e..5e6e407ce6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- celery/backends/rpc.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ celery/backends/rpc.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,7 +17,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from celery.five import items, range
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from . import base
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-from .async import AsyncBackendMixin, BaseResultConsumer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++from .asynchronous import AsyncBackendMixin, BaseResultConsumer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __all__ = ('BacklogLimitExceeded', 'RPCBackend')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git docs/internals/reference/celery.backends.async.rst docs/internals/reference/celery.backends.asynchronous.rst
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+similarity index 52%
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+rename from docs/internals/reference/celery.backends.async.rst
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+rename to docs/internals/reference/celery.backends.asynchronous.rst
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 03d10feb33..fef524294e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- docs/internals/reference/celery.backends.async.rst
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ docs/internals/reference/celery.backends.asynchronous.rst
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,12 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ =====================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ``celery.backends.async``
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ``celery.backends.asynchronous``
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ =====================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .. contents::
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ :local:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-.. currentmodule:: celery.backends.async
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.. currentmodule:: celery.backends.asynchronous
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-.. automodule:: celery.backends.async
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.. automodule:: celery.backends.asynchronous
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ :members:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ :undoc-members:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git t/unit/backends/test_redis.py t/unit/backends/test_redis.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 166aa0dc34..6a7dbbd501 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- t/unit/backends/test_redis.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ t/unit/backends/test_redis.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -146,7 +146,7 @@ class _RedisBackend(RedisBackend):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def get_consumer(self):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return self.get_backend().result_consumer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @patch('celery.backends.async.BaseResultConsumer.on_after_fork')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @patch('celery.backends.asynchronous.BaseResultConsumer.on_after_fork')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def test_on_after_fork(self, parent_method):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ consumer = self.get_consumer()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ consumer.start('none')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -172,7 +172,7 @@ def test_on_after_fork(self, parent_method):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ parent_method.assert_called_once()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @patch('celery.backends.redis.ResultConsumer.cancel_for')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @patch('celery.backends.async.BaseResultConsumer.on_state_change')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @patch('celery.backends.asynchronous.BaseResultConsumer.on_state_change')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def test_on_state_change(self, parent_method, cancel_for):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ consumer = self.get_consumer()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ meta = {'task_id': 'testing', 'status': states.SUCCESS}
</span></pre><pre style='margin:0'>
</pre>