Skip to content

Commit

Permalink
Fix missing imports and erroneously named files.
Browse files Browse the repository at this point in the history
  • Loading branch information
vmlaker committed Oct 8, 2013
1 parent 3f1f34b commit 4fd8fa6
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 9 deletions.
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ def run(self):
author_email = '[email protected]',
license = 'MIT',
long_description = open('README.rst').read(),
package_dir = {'' : 'src'},
package_dir = {'mpipe' : 'src'},
packages = ['mpipe'],
cmdclass = { 'clean2' : Clean2, 'test' : Test, },
classifiers = [
'Development Status :: 5 - Production/Stable',
Expand Down
1 change: 1 addition & 0 deletions src/FilterStage.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""Implements FilterStage class."""

from .Stage import Stage
from .FilterWorker import FilterWorker

class FilterStage(Stage):
"""Single worker stage running
Expand Down
2 changes: 2 additions & 0 deletions src/FilterWorker.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
"""Implements FilterWorker class."""

import sys
from .OrderedWorker import OrderedWorker
from .Pipeline import Pipeline

class FilterWorker(OrderedWorker):
"""FilterWorker filters input to sub-pipelines."""
Expand Down
1 change: 1 addition & 0 deletions src/OrderedStage.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""Implements OrderedStage class."""

from .Stage import Stage
from .OrderedWorker import OrderedWorker

class OrderedStage(Stage):
"""A specialized :class:`~mpipe.Stage`,
Expand Down
1 change: 1 addition & 0 deletions src/OrderedWorker.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""Implements OrderedWorker class."""

import multiprocessing
from .TubeP import TubeP

class OrderedWorker(multiprocessing.Process):
"""An OrderedWorker object operates in a stage where the order
Expand Down
2 changes: 2 additions & 0 deletions src/TupeP.py → src/TubeP.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
"""Implements TubeP class."""

import multiprocessing

class TubeP:
"""A unidirectional communication channel
using :class:`multiprocessing.Connection` for underlying implementation."""
Expand Down
2 changes: 2 additions & 0 deletions src/TupeQ.py → src/TubeQ.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
"""Implements TubeQ class."""

import multiprocessing

class TubeQ:
"""A unidirectional communication channel
using :class:`multiprocessing.Queue` for underlying implementation."""
Expand Down
1 change: 1 addition & 0 deletions src/UnorderedStage.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""Implements UnorderedStage class."""

from .Stage import Stage
from .UnorderedWorker import UnorderedWorker

class UnorderedStage(Stage):
"""A specialized :class:`~mpipe.Stage`,
Expand Down
1 change: 1 addition & 0 deletions src/UnorderedWorker.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""Implements UnorderedWorker class."""

import multiprocessing
from .TubeQ import TubeQ

class UnorderedWorker(multiprocessing.Process):
"""An UnorderedWorker object operates independently of other
Expand Down
16 changes: 8 additions & 8 deletions src/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

__version__ = '1.0.7'

from OrderedWorker import OrderedWorker
from UnorderedWorker import UnorderedWorker
from Stage import Stage
from OrderedStage import OrderedStage
from UnorderedStage import UnorderedStage
from Pipeline import Pipeline
from FilterWorker import FilterWorker
from FilterStage import FilterStage
from .OrderedWorker import OrderedWorker
from .UnorderedWorker import UnorderedWorker
from .Stage import Stage
from .OrderedStage import OrderedStage
from .UnorderedStage import UnorderedStage
from .Pipeline import Pipeline
from .FilterWorker import FilterWorker
from .FilterStage import FilterStage

0 comments on commit 4fd8fa6

Please sign in to comment.