diff --git a/.gitignore b/.gitignore index 368810a..4168463 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ build/ dist/ *.egg-info/ +myenv/ +__pycache__/ diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..d0f84b5 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,3 @@ +* 1.0.1 - Mar 15 2016 +- Remove debugging print +- Note that it has been explicitly tested on 2.7, 3.4, and 3.5 in README. diff --git a/MANIFEST.in b/MANIFEST.in index fdfcb86..4a8d1d5 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -3,5 +3,6 @@ include LICENSE include README.md include README.rst include MANIFEST.in +include ChangeLog recursive-include func_timeout *.py recursive-include doc *.html diff --git a/README.md b/README.md index 64012e4..580668b 100644 --- a/README.md +++ b/README.md @@ -52,4 +52,6 @@ So, for esxample, if you have a function "doit('arg1', 'arg2')" that you want to Support ------- -I've tested func\_timeout with python 2.7 and python 3.5. +I've tested func\_timeout with python 2.7, 3.4, and 3.5. It should work on other versions as well. + +ChangeLog can be found at https://github.com/kata198/func_timeout/ChangeLog diff --git a/README.rst b/README.rst index 9cd5908..3ef44d9 100644 --- a/README.rst +++ b/README.rst @@ -71,4 +71,6 @@ So, for esxample, if you have a function "doit('arg1', 'arg2')" that you want to Support ------- -I've tested func_timeout with python 2.7 and python 3.5. +I've tested func\_timeout with python 2.7, 3.4, and 3.5. It should work on other versions as well. + +ChangeLog can be found at https://github.com/kata198/func_timeout/ChangeLog diff --git a/func_timeout/__init__.py b/func_timeout/__init__.py index 59fd7f2..1a80394 100644 --- a/func_timeout/__init__.py +++ b/func_timeout/__init__.py @@ -5,12 +5,11 @@ LICENSE, otherwise it is available at https://github.com/kata198/func_timeout/LICENSE ''' -import sys import threading import time -__version__ = '1.0.0' -__version_tuple__ = (1, 0, 0) +__version__ = '1.0.1' +__version_tuple__ = (1, 0, 1) __all__ = ('func_timeout', 'FunctionTimedOut') @@ -39,7 +38,6 @@ def func_timeout(timeout, func, args=(), kwargs=None): exception = [] def funcwrap(args2, kwargs2): - sys.stdout.write('Args2: %s\nkwargs2: %s\n' %(str(args2), str(kwargs2))) try: ret.append( func(*args2, **kwargs2) ) except Exception as e: diff --git a/setup.py b/setup.py index 96cb110..0f4dba4 100755 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ if __name__ == '__main__': log_description = summary setup(name='func_timeout', - version='1.0.0', + version='1.0.1', packages=['func_timeout'], author='Tim Savannah', author_email='kata198@gmail.com',