Skip to content

Commit

Permalink
removed covrun and increated pep8 coverage
Browse files Browse the repository at this point in the history
  • Loading branch information
lsbardel committed Feb 25, 2015
1 parent d86ae33 commit ac2010f
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 30 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ services:
- redis-server

script:
- python -m covrun --pep8 pulsar examples tests
- pep8
- sudo rm -rf pulsar
- python -m covrun
- python -m runtests --coverage
- python -m runtests --coveralls

notifications:
Expand Down
2 changes: 1 addition & 1 deletion clean.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

remove_dirs = ('dist', 'build', 'pulsar.egg-info')


def rmgeneric(path, __func__):
try:
__func__(path)
#print 'Removed ', path
return 1
except OSError as e:
print('Could not remove {0}, {1}'.format(path, e))
Expand Down
17 changes: 0 additions & 17 deletions covrun.py

This file was deleted.

9 changes: 3 additions & 6 deletions extensions/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@

include_dirs = []
ext_errors = (CCompilerError, DistutilsExecError, DistutilsPlatformError)
if sys.platform == 'win32':
# 2.6's distutils.msvc9compiler can raise an IOError when failing to
# find the compiler
ext_errors += (IOError,)


class BuildFailed(Exception):

Expand All @@ -42,7 +39,7 @@ def build_extension(self, ext):
raise BuildFailed
except ValueError:
# this can happen on Windows 64 bit, see Python issue 7511
if "'path'" in str(sys.exc_info()[1]): # works with both py 2/3
if "'path'" in str(sys.exc_info()[1]): # works with both py 2/3
raise BuildFailed
raise

Expand All @@ -60,5 +57,5 @@ def lib_extension():
def libparams():
extensions = [lib_extension()]
return {'ext_modules': cythonize(extensions),
'cmdclass': {'build_ext' : tolerant_build_ext},
'cmdclass': {'build_ext': tolerant_build_ext},
'include_dirs': include_dirs}
1 change: 0 additions & 1 deletion pulsar/utils/security.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,3 @@ def check_password_hash(pwhash, password):
return False
salt, hashval = pwhash.split('$')
return _hash_internal(salt, password) == hashval

2 changes: 1 addition & 1 deletion runtests.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def run(**params):
repo_token=repo_token)
sys.exit(0)
# Run the test suite
if '--coverage' in args or params.get('coverage'):
if '--coverage' in args:
import coverage
print('Start coverage')
p = current_process()
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[pep8]
exclude = __pycache__
exclude = __pycache__,docs
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def get_rel_dir(d, base, res=''):
def run_setup(params=None):
argv = sys.argv
command = argv[1] if len(argv) > 1 else None
if not params or command=='sdist':
if not params or command == 'sdist':
params = {'cmdclass': {}}
else:
params = params()
Expand Down

0 comments on commit ac2010f

Please sign in to comment.