Commits

Lynn Rees committed ddca2d3

- fix imports

  • Participants
  • Parent commits f382074
  • Tags 0.5.5

Comments (0)

Files changed (10)

 include CHANGELOG
 include MANIFEST.in
 include README.rst
+include reqs/requires.txt
 recursive-include shove *.py

File reqs/dev_requires.txt

+include test_requires.txt
+tox
+sphinx
+sphinxcontrib.spelling
+Sphinx-PyPI-upload
+Fabric
+hg-github

File reqs/requires.txt

+futures
+stuf==0.9.4

File reqs/test_requires.txt

+futures
 # -*- coding: utf-8 -*-
 '''setup for shove'''
 
+from os import getcwd
+from os.path import join
+
 from setuptools import setup, find_packages
 
 
             if line.startswith('__version__'):
                 return '%s.%s.%s' % eval(line[13:].rstrip())
 
+install_requires = list(l.strip() for l in open(
+    join(getcwd(), 'reqs/requires.txt'),
+))
+
 setup(
     name='shove',
     version=getversion('shove/__init__.py'),
-    description='''Common object storage frontend''',
+    description='Common object storage frontend.',
     long_description=open('README.rst').read(),
     author='L. C. Rees',
     author_email='lcrees@gmail.com',
     license='BSD',
     packages=find_packages(),
     test_suite='shove.tests',
-    install_requires=['futures', 'stuf>=0.8.19'],
+    install_requires=install_requires,
     zip_safe=False,
     keywords='object storage persistence database shelve',
     classifiers=[

File shove/base.py

 from stuf.six import pickle
 from stuf.utils import loads, optimize
 
-
 from shove._compat import url2pathname, quote_plus, unquote_plus
 
 

File shove/cache.py

 # -*- coding: utf-8 -*-
-'''
-shove cache core
-'''
+'''shove cache core.'''
 
 import random
 from time import time

File shove/core.py

 from operator import methodcaller
 from collections import MutableMapping
 
-from stuf.iterable import exhaustmap
+from stuf import exhaustmap
 from concurrent.futures import ThreadPoolExecutor
 
 from shove._imports import cache_backend, store_backend

File tests/test_store.py

 
         def setUp(self):
             from shove import Shove
-            from pycassa.system_manager import SystemManager  # @UnresolvedImport @IgnorePep8
-            system_manager = SystemManager('localhost:9160')
+#            from pycassa.system_manager import SystemManager  # @UnresolvedImport @IgnorePep8
+#            system_manager = SystemManager('localhost:9160')
 #            system_manager.create_column_family('Murk', 'shove')
             self.store = Shove('cassandra://localhost:9160/Murk/shove')
 
 [testenv:py26]
 sitepackages=True
 deps=
-  hg+ssh://hg@bitbucket.org/lcrees/stuf@pu#egg=stuf
+  ;hg+ssh://hg@bitbucket.org/lcrees/stuf@pu#egg=stuf
   fabric
   subprocess32
   unittest2
 [testenv:py27]
 sitepackages=True
 deps=
-  hg+ssh://hg@bitbucket.org/lcrees/stuf@pu#egg=stuf
+  ;hg+ssh://hg@bitbucket.org/lcrees/stuf@pu#egg=stuf
   fabric
   subprocess32
   unittest2