From 5412ac8ac9e640e7a9ef34751e211aea03152518 Mon Sep 17 00:00:00 2001 From: Ask Solem Date: Thu, 2 Aug 2012 16:22:55 +0100 Subject: [PATCH] cl renamed to cell --- LICENSE | 2 +- MANIFEST.in | 2 +- README.rst | 14 ++++++------ {cl => cell}/__init__.py | 6 ++--- {cl => cell}/actors.py | 4 ++-- {cl => cell}/agents.py | 2 +- {cl => cell}/bin/__init__.py | 0 {cl => cell}/bin/base.py | 2 +- cl/bin/cl.py => cell/bin/cell.py | 8 +++---- {cl => cell}/exceptions.py | 6 ++--- {cl => cell}/g/__init__.py | 2 +- {cl => cell}/g/eventlet.py | 0 {cl => cell}/models.py | 2 +- {cl => cell}/presence.py | 4 ++-- {cl => cell}/results.py | 6 ++--- {cl => cell}/utils/__init__.py | 0 contrib/release/doc4allmods | 2 +- contrib/release/py3k-run-tests | 8 +++---- contrib/release/verify-reference-index.sh | 2 +- docs/.templates/page.html | 8 +++---- docs/conf.py | 14 ++++++------ docs/index.rst | 6 ++--- .../{cl.bin.base.rst => cell.actors.rst} | 6 ++--- .../{cl.bin.cl.rst => cell.agents.rst} | 6 ++--- docs/reference/cell.bin.base.rst | 11 ++++++++++ docs/reference/cell.bin.cell.rst | 11 ++++++++++ docs/reference/cell.exceptions.rst | 11 ++++++++++ docs/reference/cell.g.eventlet.rst | 11 ++++++++++ docs/reference/{cl.g.rst => cell.g.rst} | 6 ++--- .../{cl.actors.rst => cell.models.rst} | 6 ++--- docs/reference/cell.presence.rst | 11 ++++++++++ docs/reference/cell.results.rst | 11 ++++++++++ .../{cl.agents.rst => cell.utils.rst} | 6 ++--- docs/reference/cl.exceptions.rst | 11 ---------- docs/reference/cl.g.eventlet.rst | 11 ---------- docs/reference/cl.models.rst | 11 ---------- docs/reference/cl.presence.rst | 11 ---------- docs/reference/cl.results.rst | 11 ---------- docs/reference/cl.utils.rst | 11 ---------- docs/reference/index.rst | 22 +++++++++---------- examples/__init__.py | 0 examples/clex.py | 6 ++--- examples/distributed_cache.py | 4 ++-- examples/hello.py | 2 +- pavement.py | 12 +++++----- setup.cfg | 6 ++--- setup.py | 12 +++++----- 47 files changed, 163 insertions(+), 163 deletions(-) rename {cl => cell}/__init__.py (94%) rename {cl => cell}/actors.py (99%) rename {cl => cell}/agents.py (98%) rename {cl => cell}/bin/__init__.py (100%) rename {cl => cell}/bin/base.py (99%) rename cl/bin/cl.py => cell/bin/cell.py (92%) rename {cl => cell}/exceptions.py (88%) rename {cl => cell}/g/__init__.py (95%) rename {cl => cell}/g/eventlet.py (100%) rename {cl => cell}/models.py (99%) rename {cl => cell}/presence.py (99%) rename {cl => cell}/results.py (94%) rename {cl => cell}/utils/__init__.py (100%) rename docs/reference/{cl.bin.base.rst => cell.actors.rst} (60%) rename docs/reference/{cl.bin.cl.rst => cell.agents.rst} (60%) create mode 100644 docs/reference/cell.bin.base.rst create mode 100644 docs/reference/cell.bin.cell.rst create mode 100644 docs/reference/cell.exceptions.rst create mode 100644 docs/reference/cell.g.eventlet.rst rename docs/reference/{cl.g.rst => cell.g.rst} (66%) rename docs/reference/{cl.actors.rst => cell.models.rst} (60%) create mode 100644 docs/reference/cell.presence.rst create mode 100644 docs/reference/cell.results.rst rename docs/reference/{cl.agents.rst => cell.utils.rst} (61%) delete mode 100644 docs/reference/cl.exceptions.rst delete mode 100644 docs/reference/cl.g.eventlet.rst delete mode 100644 docs/reference/cl.models.rst delete mode 100644 docs/reference/cl.presence.rst delete mode 100644 docs/reference/cl.results.rst delete mode 100644 docs/reference/cl.utils.rst delete mode 100644 examples/__init__.py diff --git a/LICENSE b/LICENSE index 20d4a67..f5feafe 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2011 VMware, Inc. +Copyright (c) 2011-2012 VMware, Inc. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/MANIFEST.in b/MANIFEST.in index fb4d2b7..c27b9b5 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -5,6 +5,6 @@ include MANIFEST.in include README.rst include README include setup.cfg -recursive-include cl *.py +recursive-include cell *.py recursive-include requirements *.txt recursive-include examples *.py diff --git a/README.rst b/README.rst index 4df81aa..276f02d 100644 --- a/README.rst +++ b/README.rst @@ -1,5 +1,5 @@ ############################################# - cl - Actor framework for Kombu + cell - Actor framework for Kombu ############################################# :Version: 0.0.3 @@ -7,7 +7,7 @@ Synopsis ======== -`cl` (pronounced *cell*) is an actor framework for `Kombu`_. +`cell` is an actor framework for `Kombu`_. .. _`Kombu`: http://pypi.python.org/pypi/kombu @@ -15,16 +15,16 @@ Synopsis Installation ============ -You can install `cl` either via the Python Package Index (PyPI) +You can install `cell` either via the Python Package Index (PyPI) or from source. To install using `pip`,:: - $ pip install cl + $ pip install cell To install using `easy_install`,:: - $ easy_install cl + $ easy_install cell If you have downloaded a source tarball you can install it by doing the following,:: @@ -47,12 +47,12 @@ Bug tracker =========== If you have any suggestions, bug reports or annoyances please report them -to our issue tracker at http://github.com/celery/cl/issues/ +to our issue tracker at http://github.com/celery/cell/issues/ Contributing ============ -Development of `cl` happens at Github: http://github.com/celery/cl +Development of `cell` happens at Github: http://github.com/celery/cell You are highly encouraged to participate in the development. If you don't like Github (for some reason) you're welcome to send regular patches. diff --git a/cl/__init__.py b/cell/__init__.py similarity index 94% rename from cl/__init__.py rename to cell/__init__.py index c5a8b22..dfbd7fb 100644 --- a/cl/__init__.py +++ b/cell/__init__.py @@ -6,7 +6,7 @@ __version__ = '.'.join(map(str, VERSION[0:3])) + ''.join(VERSION[3:]) __author__ = 'Ask Solem' __contact__ = 'ask@celeryproject.org' -__homepage__ = 'http://github.com/celery/cl/' +__homepage__ = 'http://github.com/celery/cell/' __docformat__ = 'restructuredtext en' # -eof meta- @@ -17,8 +17,8 @@ from types import ModuleType all_by_module = { - 'cl.actors': ['Actor'], - 'cl.agents': ['Agent'], + 'cell.actors': ['Actor'], + 'cell.agents': ['Agent'], } object_origins = {} diff --git a/cl/actors.py b/cell/actors.py similarity index 99% rename from cl/actors.py rename to cell/actors.py index 7f67b5a..5b08788 100644 --- a/cl/actors.py +++ b/cell/actors.py @@ -1,4 +1,4 @@ -"""cl.actors""" +"""cell.actors""" from __future__ import absolute_import, with_statement @@ -42,7 +42,7 @@ class Actor(object): AsyncResult = AsyncResult - Error = exceptions.clError + Error = exceptions.CellError Next = exceptions.Next NoReplyError = exceptions.NoReplyError NoRouteError = exceptions.NoRouteError diff --git a/cl/agents.py b/cell/agents.py similarity index 98% rename from cl/agents.py rename to cell/agents.py index b85305e..e337390 100644 --- a/cl/agents.py +++ b/cell/agents.py @@ -1,4 +1,4 @@ -"""cl.agents""" +"""cell.agents""" from __future__ import absolute_import diff --git a/cl/bin/__init__.py b/cell/bin/__init__.py similarity index 100% rename from cl/bin/__init__.py rename to cell/bin/__init__.py diff --git a/cl/bin/base.py b/cell/bin/base.py similarity index 99% rename from cl/bin/base.py rename to cell/bin/base.py index 5dde5c5..8f43bc9 100644 --- a/cl/bin/base.py +++ b/cell/bin/base.py @@ -1,4 +1,4 @@ -"""cl.bin.base""" +"""cell.bin.base""" from __future__ import absolute_import diff --git a/cl/bin/cl.py b/cell/bin/cell.py similarity index 92% rename from cl/bin/cl.py rename to cell/bin/cell.py index 0f2938c..4f94a1d 100644 --- a/cl/bin/cl.py +++ b/cell/bin/cell.py @@ -1,4 +1,4 @@ -"""cl.bin.cl""" +"""cell.bin.cell""" from __future__ import absolute_import @@ -8,12 +8,12 @@ from cyme import Agent from cyme.utils import instantiate -__all__ = ['cl', 'main'] +__all__ = ['cell', 'main'] DEFAULT_BROKER_URL = 'amqp://guest:guest@localhost:5672//' -class cl(Command): +class cell(Command): args = '' option_list = ( @@ -46,7 +46,7 @@ def run(self, *actors, **kwargs): def main(argv=None): - return cl().execute_from_commandline(argv) + return cell().execute_from_commandline(argv) if __name__ == '__main__': diff --git a/cl/exceptions.py b/cell/exceptions.py similarity index 88% rename from cl/exceptions.py rename to cell/exceptions.py index 96802e4..c7c1450 100644 --- a/cl/exceptions.py +++ b/cell/exceptions.py @@ -1,8 +1,8 @@ -"""cl.exceptions""" +"""cell.exceptions""" from __future__ import absolute_import -__all__ = ['clError', 'Next', 'NoReplyError', 'NotBoundError'] +__all__ = ['CellError', 'Next', 'NoReplyError', 'NotBoundError'] FRIENDLY_ERROR_FMT = """ Remote method raised exception: @@ -11,7 +11,7 @@ """ -class clError(Exception): +class CellError(Exception): """Remote method raised exception.""" exc = None traceback = None diff --git a/cl/g/__init__.py b/cell/g/__init__.py similarity index 95% rename from cl/g/__init__.py rename to cell/g/__init__.py index 4e139e7..0171efc 100644 --- a/cl/g/__init__.py +++ b/cell/g/__init__.py @@ -5,7 +5,7 @@ from cyme.utils import cached_property G_NOT_FOUND = """\ -cl does not currently support %r, please use one of %s\ +cell does not currently support %r, please use one of %s\ """ diff --git a/cl/g/eventlet.py b/cell/g/eventlet.py similarity index 100% rename from cl/g/eventlet.py rename to cell/g/eventlet.py diff --git a/cl/models.py b/cell/models.py similarity index 99% rename from cl/models.py rename to cell/models.py index d838d85..e745570 100644 --- a/cl/models.py +++ b/cell/models.py @@ -1,4 +1,4 @@ -"""cl.models""" +"""cell.models""" from __future__ import absolute_import diff --git a/cl/presence.py b/cell/presence.py similarity index 99% rename from cl/presence.py rename to cell/presence.py index b1e2c87..ff45a83 100644 --- a/cl/presence.py +++ b/cell/presence.py @@ -1,4 +1,4 @@ -"""cl.presence""" +"""cell.presence""" from __future__ import absolute_import, with_statement @@ -23,7 +23,7 @@ class State(LogMixin): - logger_name = 'cl.presence.state' + logger_name = 'cell.presence.state' def __init__(self, presence): self.presence = presence diff --git a/cl/results.py b/cell/results.py similarity index 94% rename from cl/results.py rename to cell/results.py index cbec677..37c8419 100644 --- a/cl/results.py +++ b/cell/results.py @@ -1,17 +1,17 @@ -"""cl.result""" +"""cell.result""" from __future__ import absolute_import from __future__ import with_statement from kombu.pools import producers -from .exceptions import clError, NoReplyError +from .exceptions import CellError, NoReplyError __all__ = ['AsyncResult'] class AsyncResult(object): - Error = clError + Error = CellError NoReplyError = NoReplyError def __init__(self, ticket, actor): diff --git a/cl/utils/__init__.py b/cell/utils/__init__.py similarity index 100% rename from cl/utils/__init__.py rename to cell/utils/__init__.py diff --git a/contrib/release/doc4allmods b/contrib/release/doc4allmods index 14d2287..1e20ad2 100755 --- a/contrib/release/doc4allmods +++ b/contrib/release/doc4allmods @@ -2,7 +2,7 @@ PACKAGE="$1" SKIP_PACKAGES="$PACKAGE tests" -SKIP_FILES="cl.bin.rst" +SKIP_FILES="cell.bin.rst" modules=$(find "$PACKAGE" -name "*.py") diff --git a/contrib/release/py3k-run-tests b/contrib/release/py3k-run-tests index 1eb776a..8663d43 100755 --- a/contrib/release/py3k-run-tests +++ b/contrib/release/py3k-run-tests @@ -1,15 +1,15 @@ #!/bin/bash base=${1:-.} -nosetests -vd cl.tests \ +nosetests -vd cell.tests \ --with-coverage3 \ --cover3-branch \ --cover3-xml \ --cover3-xml-file="$base/coverage.xml" \ --cover3-html \ --cover3-html-dir="$base/cover" \ - --cover3-package=cl \ + --cover3-package=cell \ --cover3-exclude=" \ - cl \ - cl.tests.* \ + cell \ + cell.tests.* \ --with-xunit \ --xunit-file="$base/nosetests.xml" diff --git a/contrib/release/verify-reference-index.sh b/contrib/release/verify-reference-index.sh index 7c2e7f6..f03638c 100755 --- a/contrib/release/verify-reference-index.sh +++ b/contrib/release/verify-reference-index.sh @@ -1,7 +1,7 @@ #!/bin/bash verify_index() { - modules=$(grep "cl." "$1" | \ + modules=$(grep "cell." "$1" | \ perl -ple's/^\s*|\s*$//g;s{\.}{/}g;') retval=0 for module in $modules; do diff --git a/docs/.templates/page.html b/docs/.templates/page.html index c4b3334..57b6a02 100644 --- a/docs/.templates/page.html +++ b/docs/.templates/page.html @@ -4,15 +4,15 @@ {% if version == "0.2" %}

- This document is for cl's development version, which can be + This document is for cell's development version, which can be significantly different from previous releases. Get old docs here: - 2.1. + 2.1.

{% else %}

- This document describes Celery {{ version }}. For development docs, - go here. + This document describes cell {{ version }}. For development docs, + go here.

{% endif %} diff --git a/docs/conf.py b/docs/conf.py index 6d88cd1..eca9603 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -10,7 +10,7 @@ # absolute, like shown here. sys.path.append(os.path.join(os.pardir, "tests")) sys.path.append(os.path.join(this, "_ext")) -import cl +import cell # General configuration # --------------------- @@ -30,17 +30,17 @@ master_doc = 'index' # General information about the project. -project = u'cl' -copyright = u'2011, Ask Solem & Contributors' +project = u'cell' +copyright = u'2011-2012, Ask Solem & Contributors' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. # # The short X.Y version. -version = ".".join(map(str, cl.VERSION[0:2])) +version = ".".join(map(str, cell.VERSION[0:2])) # The full version, including alpha/beta/rc tags. -release = cl.__version__ +release = cell.__version__ exclude_trees = ['.build'] @@ -64,7 +64,7 @@ html_use_index = True latex_documents = [ - ('index', 'cl.tex', ur'cl Documentation', + ('index', 'cell.tex', ur'cell Documentation', ur'Ask Solem & Contributors', 'manual'), ] @@ -79,5 +79,5 @@ ### Issuetracker issuetracker = "github" -issuetracker_project = "ask/cl" +issuetracker_project = "celery/cell" issuetracker_issue_pattern = r'[Ii]ssue #(\d+)' diff --git a/docs/index.rst b/docs/index.rst index 557b8d7..4409fda 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,6 +1,6 @@ -======================= - cl - Actors for Kombu -======================= +========================= + cell - Actors for Kombu +========================= Contents: diff --git a/docs/reference/cl.bin.base.rst b/docs/reference/cell.actors.rst similarity index 60% rename from docs/reference/cl.bin.base.rst rename to docs/reference/cell.actors.rst index 28b0b2c..9618e02 100644 --- a/docs/reference/cl.bin.base.rst +++ b/docs/reference/cell.actors.rst @@ -1,11 +1,11 @@ ======================== - cl.bin.base + cell.actors ======================== .. contents:: :local: -.. currentmodule:: cl.bin.base +.. currentmodule:: cell.actors -.. automodule:: cl.bin.base +.. automodule:: cell.actors :members: :undoc-members: diff --git a/docs/reference/cl.bin.cl.rst b/docs/reference/cell.agents.rst similarity index 60% rename from docs/reference/cl.bin.cl.rst rename to docs/reference/cell.agents.rst index e5965bd..f7eea54 100644 --- a/docs/reference/cl.bin.cl.rst +++ b/docs/reference/cell.agents.rst @@ -1,11 +1,11 @@ ======================== - cl.bin.cl + cell.agents ======================== .. contents:: :local: -.. currentmodule:: cl.bin.cl +.. currentmodule:: cell.agents -.. automodule:: cl.bin.cl +.. automodule:: cell.agents :members: :undoc-members: diff --git a/docs/reference/cell.bin.base.rst b/docs/reference/cell.bin.base.rst new file mode 100644 index 0000000..c306d5e --- /dev/null +++ b/docs/reference/cell.bin.base.rst @@ -0,0 +1,11 @@ +======================== + cell.bin.base +======================== + +.. contents:: + :local: +.. currentmodule:: cell.bin.base + +.. automodule:: cell.bin.base + :members: + :undoc-members: diff --git a/docs/reference/cell.bin.cell.rst b/docs/reference/cell.bin.cell.rst new file mode 100644 index 0000000..5735e66 --- /dev/null +++ b/docs/reference/cell.bin.cell.rst @@ -0,0 +1,11 @@ +======================== + cell.bin.cell +======================== + +.. contents:: + :local: +.. currentmodule:: cell.bin.cell + +.. automodule:: cell.bin.cell + :members: + :undoc-members: diff --git a/docs/reference/cell.exceptions.rst b/docs/reference/cell.exceptions.rst new file mode 100644 index 0000000..bea4d7e --- /dev/null +++ b/docs/reference/cell.exceptions.rst @@ -0,0 +1,11 @@ +======================== + cell.exceptions +======================== + +.. contents:: + :local: +.. currentmodule:: cell.exceptions + +.. automodule:: cell.exceptions + :members: + :undoc-members: diff --git a/docs/reference/cell.g.eventlet.rst b/docs/reference/cell.g.eventlet.rst new file mode 100644 index 0000000..f2194e2 --- /dev/null +++ b/docs/reference/cell.g.eventlet.rst @@ -0,0 +1,11 @@ +======================== + cell.g.eventlet +======================== + +.. contents:: + :local: +.. currentmodule:: cell.g.eventlet + +.. automodule:: cell.g.eventlet + :members: + :undoc-members: diff --git a/docs/reference/cl.g.rst b/docs/reference/cell.g.rst similarity index 66% rename from docs/reference/cl.g.rst rename to docs/reference/cell.g.rst index fb9aa73..f0c2c3b 100644 --- a/docs/reference/cl.g.rst +++ b/docs/reference/cell.g.rst @@ -1,11 +1,11 @@ ======================== - cl.g + cell.g ======================== .. contents:: :local: -.. currentmodule:: cl.g +.. currentmodule:: cell.g -.. automodule:: cl.g +.. automodule:: cell.g :members: :undoc-members: diff --git a/docs/reference/cl.actors.rst b/docs/reference/cell.models.rst similarity index 60% rename from docs/reference/cl.actors.rst rename to docs/reference/cell.models.rst index 06797ef..669a7b1 100644 --- a/docs/reference/cl.actors.rst +++ b/docs/reference/cell.models.rst @@ -1,11 +1,11 @@ ======================== - cl.actors + cell.models ======================== .. contents:: :local: -.. currentmodule:: cl.actors +.. currentmodule:: cell.models -.. automodule:: cl.actors +.. automodule:: cell.models :members: :undoc-members: diff --git a/docs/reference/cell.presence.rst b/docs/reference/cell.presence.rst new file mode 100644 index 0000000..6bf85b2 --- /dev/null +++ b/docs/reference/cell.presence.rst @@ -0,0 +1,11 @@ +======================== + cell.presence +======================== + +.. contents:: + :local: +.. currentmodule:: cell.presence + +.. automodule:: cell.presence + :members: + :undoc-members: diff --git a/docs/reference/cell.results.rst b/docs/reference/cell.results.rst new file mode 100644 index 0000000..bc52292 --- /dev/null +++ b/docs/reference/cell.results.rst @@ -0,0 +1,11 @@ +======================== + cell.results +======================== + +.. contents:: + :local: +.. currentmodule:: cell.results + +.. automodule:: cell.results + :members: + :undoc-members: diff --git a/docs/reference/cl.agents.rst b/docs/reference/cell.utils.rst similarity index 61% rename from docs/reference/cl.agents.rst rename to docs/reference/cell.utils.rst index a505318..15a17ce 100644 --- a/docs/reference/cl.agents.rst +++ b/docs/reference/cell.utils.rst @@ -1,11 +1,11 @@ ======================== - cl.agents + cell.utils ======================== .. contents:: :local: -.. currentmodule:: cl.agents +.. currentmodule:: cell.utils -.. automodule:: cl.agents +.. automodule:: cell.utils :members: :undoc-members: diff --git a/docs/reference/cl.exceptions.rst b/docs/reference/cl.exceptions.rst deleted file mode 100644 index cd12e55..0000000 --- a/docs/reference/cl.exceptions.rst +++ /dev/null @@ -1,11 +0,0 @@ -======================== - cl.exceptions -======================== - -.. contents:: - :local: -.. currentmodule:: cl.exceptions - -.. automodule:: cl.exceptions - :members: - :undoc-members: diff --git a/docs/reference/cl.g.eventlet.rst b/docs/reference/cl.g.eventlet.rst deleted file mode 100644 index 0873825..0000000 --- a/docs/reference/cl.g.eventlet.rst +++ /dev/null @@ -1,11 +0,0 @@ -======================== - cl.g.eventlet -======================== - -.. contents:: - :local: -.. currentmodule:: cl.g.eventlet - -.. automodule:: cl.g.eventlet - :members: - :undoc-members: diff --git a/docs/reference/cl.models.rst b/docs/reference/cl.models.rst deleted file mode 100644 index 9825aba..0000000 --- a/docs/reference/cl.models.rst +++ /dev/null @@ -1,11 +0,0 @@ -======================== - cl.models -======================== - -.. contents:: - :local: -.. currentmodule:: cl.models - -.. automodule:: cl.models - :members: - :undoc-members: diff --git a/docs/reference/cl.presence.rst b/docs/reference/cl.presence.rst deleted file mode 100644 index 919ffba..0000000 --- a/docs/reference/cl.presence.rst +++ /dev/null @@ -1,11 +0,0 @@ -======================== - cl.presence -======================== - -.. contents:: - :local: -.. currentmodule:: cl.presence - -.. automodule:: cl.presence - :members: - :undoc-members: diff --git a/docs/reference/cl.results.rst b/docs/reference/cl.results.rst deleted file mode 100644 index dde3b36..0000000 --- a/docs/reference/cl.results.rst +++ /dev/null @@ -1,11 +0,0 @@ -======================== - cl.results -======================== - -.. contents:: - :local: -.. currentmodule:: cl.results - -.. automodule:: cl.results - :members: - :undoc-members: diff --git a/docs/reference/cl.utils.rst b/docs/reference/cl.utils.rst deleted file mode 100644 index bdf8903..0000000 --- a/docs/reference/cl.utils.rst +++ /dev/null @@ -1,11 +0,0 @@ -======================== - cl.utils -======================== - -.. contents:: - :local: -.. currentmodule:: cl.utils - -.. automodule:: cl.utils - :members: - :undoc-members: diff --git a/docs/reference/index.rst b/docs/reference/index.rst index e1b9d08..7355771 100644 --- a/docs/reference/index.rst +++ b/docs/reference/index.rst @@ -8,14 +8,14 @@ .. toctree:: :maxdepth: 1 - cl.actors - cl.agents - cl.results - cl.exceptions - cl.presence - cl.models - cl.g - cl.g.eventlet - cl.utils - cl.bin.cl - cl.bin.base + cell.actors + cell.agents + cell.results + cell.exceptions + cell.presence + cell.models + cell.g + cell.g.eventlet + cell.utils + cell.bin.cell + cell.bin.base diff --git a/examples/__init__.py b/examples/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/examples/clex.py b/examples/clex.py index 5c7f8b4..1d2179d 100644 --- a/examples/clex.py +++ b/examples/clex.py @@ -1,9 +1,9 @@ -import cl +import cell from celery import current_app as celery -class BlenderActor(cl.Actor): +class BlenderActor(cell.Actor): types = ('direct', 'round-robin') def __init__(self, connection=None, *args, **kwargs): @@ -31,7 +31,7 @@ def render(self, blabla, nowait=False): blender = BlenderActor() -class Agent(cl.Agent): +class Agent(cell.Agent): actors = [blender] def __init__(self, connection=None, *args, **kwargs): diff --git a/examples/distributed_cache.py b/examples/distributed_cache.py index ecaa5a0..553e44a 100644 --- a/examples/distributed_cache.py +++ b/examples/distributed_cache.py @@ -1,7 +1,7 @@ from UserDict import DictMixin -from cl import Actor, Agent -from cl.utils import flatten +from cell import Actor, Agent +from cell.utils import flatten def first_reply(replies, key): diff --git a/examples/hello.py b/examples/hello.py index f5ed48e..dbd8a18 100644 --- a/examples/hello.py +++ b/examples/hello.py @@ -1,4 +1,4 @@ -from cl import Actor, Agent +from cell import Actor, Agent from kombu import Connection diff --git a/pavement.py b/pavement.py index 000970b..e7af7f9 100644 --- a/pavement.py +++ b/pavement.py @@ -58,11 +58,11 @@ def upload_docs(options): @task def bump(options): - sh("contrib/release/bump_version.py cl/__init__.py README.rst") + sh("contrib/release/bump_version.py cell/__init__.py README.rst") @task def autodoc(options): - sh("contrib/release/doc4allmods cl") + sh("contrib/release/doc4allmods cell") @task @@ -86,7 +86,7 @@ def readme(options): @task def bump(options): - sh("contrib/release/bump_version.py cl/__init__.py README.rst") + sh("contrib/release/bump_version.py cell/__init__.py README.rst") @task @@ -112,7 +112,7 @@ def test(options): ]) def flake8(options): noerror = getattr(options, "noerror", False) - sh("""flake8 cl""", ignore_error=noerror) + sh("""flake8 cell""", ignore_error=noerror) @task @@ -121,7 +121,7 @@ def flake8(options): ]) def flakeplus(options): noerror = getattr(options, "noerror", False) - sh("python contrib/release/flakeplus.py cl", + sh("python contrib/release/flakeplus.py cell", ignore_error=noerror) @@ -140,7 +140,7 @@ def flakes(options): ]) def pep8(options): noerror = getattr(options, "noerror", False) - return sh("""find cl -name "*.py" | xargs pep8 | perl -nle'\ + return sh("""find cell -name "*.py" | xargs pep8 | perl -nle'\ print; $a=1 if $_}{exit($a)'""", ignore_error=noerror) diff --git a/setup.cfg b/setup.cfg index 3f87f11..683ce37 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,11 +1,11 @@ [nosetests] verbosity = 1 detailed-errors = 1 -where = cl/tests +where = cell/tests cover3-branch = 1 cover3-html = 1 -cover3-package = cl -cover3-exclude = cl +cover3-package = cell +cover3-exclude = cell [build_sphinx] source-dir = docs/ diff --git a/setup.py b/setup.py index 898d419..6250717 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ if sys.version_info < (2, 5): - raise Exception('cl requires Python 2.5 or higher.') + raise Exception('cell requires Python 2.5 or higher.') try: from setuptools import setup @@ -48,7 +48,7 @@ def add_doc(m): re_vers: add_version, re_doc: add_doc} here = os.path.abspath(os.path.dirname(__file__)) -meta_fh = open(os.path.join(here, 'cl/__init__.py')) +meta_fh = open(os.path.join(here, 'cell/__init__.py')) try: meta = {} for line in meta_fh: @@ -66,7 +66,7 @@ def add_doc(m): root_dir = os.path.dirname(__file__) if root_dir != '': os.chdir(root_dir) -src_dir = 'cl' +src_dir = 'cell' def fullsplit(path, result=None): @@ -98,7 +98,7 @@ def fullsplit(path, result=None): if os.path.exists('README.rst'): long_description = codecs.open('README.rst', 'r', 'utf-8').read() else: - long_description = 'See http://pypi.python.org/pypi/cl' + long_description = 'See http://pypi.python.org/pypi/cell' install_requires = ['kombu>=1.5.0'] try: @@ -107,7 +107,7 @@ def fullsplit(path, result=None): install_requires.append('importlib') setup( - name='cl', + name='cell', version=meta['VERSION'], description=meta['doc'], author=meta['author'], @@ -136,7 +136,7 @@ def fullsplit(path, result=None): 'Topic :: Software Development :: Libraries :: Python Modules', ], entry_points={ - 'console_scripts': ['cl = cl.bin.cl:main'], + 'console_scripts': ['cell = cell.bin.cell:main'], }, long_description=long_description, **extra)