diff --git a/CHANGELOG.md b/CHANGELOG.md index 82ce6eb7dba7098df78f126168790d08cbbe7c89..4ac6044398d1c6af1645d8c121f6194081f48530 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,3 +3,6 @@ on GitHub. This file serves to only note what changes have been made so far, between releases. # v1.2.15 + +* replaced `python-prctl` with `setproctitle` thanks to the latter + having less fascist license (BSD vs GNU GPL v3) diff --git a/coolamqp/__init__.py b/coolamqp/__init__.py index a66f47052c5917797b7d919fb1fe97c812990966..7311807d23fe646b225917dcb431c815655161f4 100644 --- a/coolamqp/__init__.py +++ b/coolamqp/__init__.py @@ -1 +1 @@ -__version__ = '1.2.15a1' +__version__ = '1.2.15' diff --git a/coolamqp/utils.py b/coolamqp/utils.py index 976207a6a1a4f87e8ff3dbe4c407f074058caef6..9e71dae48b156752531c109eafe8bb89963ac57a 100644 --- a/coolamqp/utils.py +++ b/coolamqp/utils.py @@ -10,7 +10,7 @@ except IMPORT_ERRORS: from monotonic import monotonic try: - from prctl import set_name as prctl_set_name + from setproctitle import setproctitle as prctl_set_name except IMPORT_ERRORS: def prctl_set_name(name): pass diff --git a/docs/tutorial.rst b/docs/tutorial.rst index 7ca13d85574dbfd1db21c85be38c069bdb6b2c60..b3226f89b57abc8987fcae7b102a45ee9392ab47 100644 --- a/docs/tutorial.rst +++ b/docs/tutorial.rst @@ -31,10 +31,10 @@ accepts a list of nodes: *wait=True* will block until connection is completed. After this, you can use other methods. -*name* is optional. If you specify it, and have prctl_ installed, the thread will +*name* is optional. If you specify it, and have setproctitle_ installed, the thread will receive a provided label, postfixed by **AMQP listener thread**. -.. _prctl: https://pypi.org/project/python-prctl/ +.. _setproctitle: https://pypi.org/project/setproctitle/ .. autoclass:: coolamqp.clustering.Cluster :members: diff --git a/setup.py b/setup.py index 0e99fadd97595dc941f68bf5b40ec42651d0f6d7..7557db2b987e657a361790409823a1dc7b15cd33 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ setup(keywords=['amqp', 'rabbitmq', 'client', 'network', 'ha', 'high availabilit python_requires='!=2.7.*,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*', extras_require={ ':python_version == "2.7"': ['futures', 'typing', 'monotonic'], - 'prctl': ['prctl'], + 'setproctitle': ['setproctitle'], 'opentracing': ['opentracing'], 'gevent': ['gevent'] }