Commits

Lynn Rees committed 07aa974

- fix paths

Comments (0)

Files changed (18)

 include MANIFEST.in
 include README.rst
 include packages
-inclued requirements.txt
+include requirements.txt
 recursive-include callchain *.py

callchain/active_auto/chain.py

         key = 'callchain.services.filter.KSlice'
         slice = 'callchain.active_auto.chainlet.slicechain'
 
-    class permutate(Nameways):
-        key = 'callchain.services.order.KPermutate'
-        permutate = 'callchain.active_auto.chainlet.permutatechain'
+    class combine(Nameways):
+        key = 'callchain.services.order.KCombine'
+        combine = 'callchain.active_auto.chainlet.combinechain'
 
     class map(Nameways):
         key = 'callchain.services.map.KMap'

callchain/active_auto/chainlet.py

 from twoq.ordering import RandomMixin, OrderMixin, CombineMixin
 from twoq.filtering import FilterMixin, CollectMixin, SetMixin, SliceMixin
 
-from callchain.services.queue import KResult
+from callchain.services import KResult
 from callchain.call import ChainMixin, PriorityMixin
 from callchain.services.map import KDelay, KRepeat, KMap
 from callchain.keys import KCall, KChain, KConfig, KLinked
 __all__ = (
     'mathchain', 'truthchain', 'reducechain', 'collectchain', 'setchain',
     'slicechain', 'filterchain', 'delaychain', 'repeatchain', 'mapchain',
-    'randomchain', 'orderchain',
+    'randomchain', 'orderchain', 'chainlet', 'combinechain',
 )
 
 
     CombineMixin,
 ):
 
-    '''permutating chainlet'''
+    '''combining chainlet'''
 
 
 @appifies(KTruth)

callchain/active_auto/event.py

 from callchain.chain import EventRootMixin
 from callchain.services.apps import events
 from callchain.call import EventMixin, einside
+from callchain.services import KThings, KResult
 from callchain.patterns import Pathways, Nameways
-from callchain.services.queue import KThings, KResult
 from callchain.keys import KEvent, KEventRoot, KEventCall
 
 ###############################################################################
         key = 'callchain.services.filter.KCollect'
         collect = 'callchain.active_auto.eventlet.collectevent'
 
+    class combine(Nameways):
+        key = 'callchain.services.order.KCombine'
+        combine = 'callchain.active_auto.eventlet.combineevent'
+
     class set(Nameways):
         key = 'callchain.services.filter.KSet'
         set = 'callchain.active_auto.eventlet.setevent'

callchain/active_auto/eventlet.py

 __all__ = (
     'mathevent', 'truthevent', 'reduceevent', 'collectevent', 'setevent',
     'sliceevent', 'filterevent', 'delayevent', 'repeatevent', 'mapevent',
-    'randomevent', 'orderevent', 'eventlet'
+    'randomevent', 'orderevent', 'eventlet', 'combineevent'
 )
 
 
 @appifies(KCombine)
 class combineevent(eventlet, CombineMixin):
 
-    '''permutating eventlet'''
+    '''combining eventlet'''
 
 
 @appifies(KTruth)

callchain/active_man/chain.py

 
 from callchain.chain import RootMixin
 from callchain.config import Defaults
+from callchain.services import KThings, KResult
 from callchain.keys import KRoot, KCall, KChain
 from callchain.patterns import Pathways, Nameways
-from callchain.services.queue import KThings, KResult
 from callchain.call import ChainMixin, PriorityMixin, inside
 
 ###############################################################################
         key = 'callchain.services.filter.KSlice'
         slice = 'callchain.active_man.chainlet.slicechain'
 
+    class combine(Nameways):
+        key = 'callchain.services.order.KCombine'
+        combine = 'callchain.active_man.chainlet.combinechain'
+
     class map(Nameways):
         key = 'callchain.services.map.KMap'
         map = 'callchain.active_man.chainlet.mapchain'

callchain/active_man/chainlet.py

     ReduceMixin,
 ):
 
-    '''manually balanced reducing chainlet'''
+    '''reducing chainlet'''
 
 
 @appifies(KCombine)
     CombineMixin,
 ):
 
-    '''permutating chainlet'''
+    '''combining chainlet'''
 
 
 @appifies(KTruth)

callchain/active_man/event.py

 from callchain.chain import EventRootMixin
 from callchain.services.apps import events
 from callchain.call import EventMixin, einside
+from callchain.services import KThings, KResult
 from callchain.patterns import Pathways, Nameways
-from callchain.services.queue import KThings, KResult
 from callchain.keys import KEvent, KEventRoot, KEventCall
 
 ###############################################################################
         key = 'callchain.services.filter.KCollect'
         collect = 'callchain.active_man.eventlet.collectevent'
 
+    class combine(Nameways):
+        key = 'callchain.services.order.KCombine'
+        combine = 'callchain.active_man.eventlet.combineevent'
+
     class set(Nameways):
         key = 'callchain.services.filter.KSet'
         set = 'callchain.active_man.eventlet.setevent'

callchain/active_man/eventlet.py

 @appifies(KCombine)
 class combineevent(eventlet, CombineMixin):
 
-    '''permutating eventlet'''
+    '''combining eventlet'''
 
 
 @appifies(KTruth)

callchain/lazy_auto/chain.py

         key = 'callchain.services.filter.KSlice'
         slice = 'callchain.lazy_auto.chainlet.slicechain'
 
+    class combine(Nameways):
+        key = 'callchain.services.order.KCombine'
+        combine = 'callchain.lazy_auto.chainlet.combinechain'
+
     class map(Nameways):
         key = 'callchain.services.map.KMap'
         map = 'callchain.lazy_auto.chainlet.mapchain'

callchain/lazy_auto/chainlet.py

 from twoq.ordering import RandomMixin, OrderMixin, CombineMixin
 from twoq.filtering import FilterMixin, CollectMixin, SetMixin, SliceMixin
 
-from callchain.services.queue import KResult
+from callchain.services import KResult
 from callchain.call import ChainMixin, PriorityMixin
 from callchain.services.map import KDelay, KRepeat, KMap
 from callchain.keys import KCall, KChain, KConfig, KLinked
     CombineMixin,
 ):
 
-    '''permutating chainlet'''
+    '''combining chainlet'''
 
 
 @appifies(KTruth)

callchain/lazy_auto/event.py

 from callchain.chain import EventRootMixin
 from callchain.services.apps import events
 from callchain.call import EventMixin, einside
+from callchain.services import KThings, KResult
 from callchain.patterns import Pathways, Nameways
-from callchain.services.queue import KThings, KResult
 from callchain.keys import KEvent, KEventRoot, KEventCall
 
 ###############################################################################
         key = 'callchain.services.filter.KCollect'
         collect = 'callchain.lazy_auto.eventlet.collectevent'
 
+    class combine(Nameways):
+        key = 'callchain.services.order.KCombine'
+        combine = 'callchain.lazy_auto.eventlet.combineevent'
+
     class set(Nameways):
         key = 'callchain.services.filter.KSet'
         set = 'callchain.lazy_auto.eventlet.setevent'

callchain/lazy_auto/eventlet.py

 @appifies(KCombine)
 class combineevent(eventlet, CombineMixin):
 
-    '''permutating eventlet'''
+    '''combining eventlet'''
 
 
 @appifies(KTruth)

callchain/lazy_man/chain.py

         key = 'callchain.services.filter.KSlice'
         slice = 'callchain.lazy_man.chainlet.slicechain'
 
+    class combine(Nameways):
+        key = 'callchain.services.order.KCombine'
+        combine = 'callchain.lazy_man.chainlet.combinechain'
+
     class map(Nameways):
         key = 'callchain.services.map.KMap'
         map = 'callchain.lazy_man.chainlet.mapchain'

callchain/lazy_man/chainlet.py

 __all__ = (
     'mathchain', 'truthchain', 'reducechain', 'collectchain', 'setchain',
     'slicechain', 'filterchain', 'delaychain', 'repeatchain', 'mapchain',
-    'randomchain', 'orderchain',
+    'randomchain', 'orderchain', 'chainlet', 'combinechain',
 )
 
 
     ReduceMixin,
 ):
 
-    '''manually balanced reducing chainlet'''
+    '''reducing chainlet'''
 
 
 @appifies(KCombine)
     CombineMixin,
 ):
 
-    '''permutating chainlet'''
+    '''combining chainlet'''
 
 
 @appifies(KTruth)

callchain/lazy_man/event.py

         key = 'callchain.services.filter.KCollect'
         collect = 'callchain.lazy_man.eventlet.collectevent'
 
+    class combine(Nameways):
+        key = 'callchain.services.order.KCombine'
+        combine = 'callchain.lazy_man.eventlet.combineevent'
+
     class set(Nameways):
         key = 'callchain.services.filter.KSet'
         set = 'callchain.lazy_man.eventlet.setevent'

callchain/lazy_man/eventlet.py

 __all__ = (
     'mathevent', 'truthevent', 'reduceevent', 'collectevent', 'setevent',
     'sliceevent', 'filterevent', 'delayevent', 'repeatevent', 'mapevent',
-    'randomevent', 'orderevent', 'eventlet'
+    'randomevent', 'orderevent', 'eventlet', 'combineevent'
 )
 
 
 @appifies(KCombine)
 class combineevent(eventlet, CombineMixin):
 
-    '''permutating eventlet'''
+    '''combining eventlet'''
 
 
 @appifies(KTruth)
     author='L. C. Rees',
     author_email='lcrees@gmail.com',
     url='https://bitbucket.org/lcrees/callchain',
-    packages=[l for l in open(join(getcwd(), 'packages'), 'r').readlines()],
+    packages=[
+        l.strip() for l in open(join(getcwd(), 'packages'), 'r').xreadlines()
+    ],
     test_suite='callchain.tests',
     zip_safe=False,
     install_requires=install_requires,