aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-06-09Merge remote-tracking branch 'goog/mirror-aosp-master' into bp_timeout am: ↵android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseFrank Feng
e2a8f4c150 am: 7805d425ee Original change: https://googleplex-android-review.googlesource.com/c/platform/external/python/timeout-decorator/+/18819311 Change-Id: I823b8095e352ef94989293db16d63231f699f031 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09Merge remote-tracking branch 'goog/mirror-aosp-master' into bp_timeout am: ↵Frank Feng
e2a8f4c150 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/python/timeout-decorator/+/18819311 Change-Id: I0671d8d0948d4b32b40fb4a1aefa854efa9a592e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09Merge remote-tracking branch 'goog/mirror-aosp-master' into bp_timeoutandroid13-devFrank Feng
Bug: 235099911 Test: TH Change-Id: I82bfe25cf9e83c7e099b69273fdac887cc89269d
2022-05-31Add build files for timeout_decoratorJulien Desprez
Test: presubmit Bug: 234458076 Change-Id: I0c1b73462637310021ba93c5acae6375ecd501d3
2022-04-25Merge remote-tracking branch 'aosp/upstream-master' into timeout-decoratorplatform-tools-33.0.2frankfeng
Bug: 228457005 Bug: 225958696 Test: TH Change-Id: I96c55c324f786a693281ac261db04fcd91284cd7
2022-04-07Initial empty repositoryRoman Yepishev
2020-11-14Roidelapluie functionkwargs (#65)upstream-masterPatrick N
* Allow to use timeout in function kwargs even when initial seconds is None Initial support for timeout in function kwargs was implemented by 187ee34d9e0a571bcc7f9233208462634940f4c0 * drop support for 2.6, 3.4, 3.5 and add support for 3.7, 3.8, 3.9 * drop support for 2.6, 3.4, 3.5 and add support for 3.7, 3.8, 3.9 * WIP trying to fix bild * WIP trying to fix bild * fix build * bump version to 0.5.0 * bump version to 0.5.0 Co-authored-by: Julien Pivotto <roidelapluie@inuits.eu> Co-authored-by: Patrick N <patricng>
2018-12-05Fix a bug when using a custom exception with a custom exception message. ↵Taylor Alexander
Also remove tests for Python 3.2 and 3.3. (#55) * Fix a bug in the code when using a custom exception with a custom exception message. Added a test for this condition. * Fix line spacing lint error. * Update CI config to remove Python 3.2 and 3.3, which are no longer supported by tox. * Remove python 3.2 and 3.3 from travis config. * Bump version number to 0.4.1. * Also update version number in init file to 0.4.1.
2017-11-06Merge pull request #40 from boynedmaster/patch-1Patrick
Update README to be updated with Python 3
2017-11-01Update README to be updated with Python 3boyned//Kampfkarren
Used the new print function instead of the print statement and changed deprecated C-style formatting to format.
2017-08-14Merge pull request #36 from joshddunn/masterPatrick
Set custom exception message in decorator
2017-06-11Bumped version to 0.4.0Josh
2017-06-10Can set exception message in decorator.Josh
2017-06-10Can set exception message in decorator with Travis CI fixes.Josh
2017-06-10Travis CI fixes 2.0Josh
2017-06-10Travis CI fixesJosh
2017-06-10Updated .gitignore to ignore .vscode/Josh
2017-06-10Can set exception message in decoratorJosh
2017-04-13Merge pull request #35 from k2fong/class-method-supportPatrick
Class method support
2017-04-11fixed an issue where the _Timeout was calledPeter Fong
2017-04-11Added unit test to cover class method casePeter Fong
2017-04-11Fixed an issue for decorating class methodsPeter Fong
2017-03-07Update README.rstPatrick
2017-02-08Merge pull request #31 from levi-rs/use-alternative-exceptionPatrick
Add ability to specify what exception gets raised
2017-02-07Add ability to specify what exception gets raisedlevi-rs
- Add keyword argument to decorator that allows the user to specify what exception is raised when the timeout is triggered - Bump version to 0.3.3
2017-01-19Merge pull request #30 from levi-rs/update-tested-python-versionsPatrick
Add additional python versions to CI testing
2017-01-18Add additional python versions to unit testinglevi-rs
- Add Python 3.5 and 3.6 to tested versions in tox.ini - Add individual python versions to .travis.yml to take advantage of Travis-CI's parallel testing - Bump py.test version to support Python 3.5 and 3.6 testing - Migrate from Travis-CI's legacy infrastructure to container infrastructure by adding `sudo: false` to .travis.yml - virtualenv >= 14.0.0 removed support for python 3.2. Add conditional installation of virtualenv and py.test for 3.2 environments
2015-06-28Merge pull request #22 from deeplook/masterPatrick
Added object base class for _Timeout class.
2015-06-26Added object baseclass for _Timeout class.Dinu Gherman
2015-03-31Merge pull request #20 from aaronelliotross/masterPatrick
Use signal.setitimer to allow setting sub-second timeouts.
2015-03-31Bump version!Aaron Elliot Ross
2015-03-31Timeout can be fractional seconds.Aaron Elliot Ross
2015-03-31Add a test for sub-second timeouts.Aaron Elliot Ross
2015-03-31Use setitimer to get sub-second timeouts.Aaron Elliot Ross
2015-03-24Merge pull request #18 from hvdklauw/multithreading-picklePatrick
Fixed issue with PicklingError causes the timeout to never be reached.
2015-03-24Bumped version to 0.3.1.Harro van der Klauw
Removed silly if statement
2015-03-23PEP8Harro van der Klauw
2015-03-23Fixed issue with PicklingError causes the timeout to never be reached.Harro van der Klauw
2015-03-17Merge pull request #17 from bubenkoff/patch-1Patrick
Update .travis.yml
2015-03-18Update .travis.ymlAnatoly Bubenkov
2015-03-17Merge pull request #16 from bubenkoff/multithreading-supportPatrick
Added optional threading support via python multiprocessing.
2015-03-16Added optional threading support via python multiprocessing. Switched to ↵Anatoly Bubenkov
pytest test runner
2015-02-15Merge pull request #14 from nugend/unset-alarmPatrick
Unset alarm before removing SIGALRM handler
2015-02-04Unset alarm before removing SIGALRM handlerDaniel Nugent
In situations where an exception is thrown, the alarm wouldn't be unset even if the handler was removed. This results in program termination.
2015-01-05increment version numberPatrick
2015-01-04Merge pull request #12 from pimterry/patch-1Patrick
Fix 0.2.0 release: include README.md that's missing from the package
2015-01-04Add README.md that's missing from the 0.2.0 releaseTim Perry
The 0.2.0 release doesn't install, because it needs a README.md file rather than README.rst, as of https://github.com/pnpnpn/timeout-decorator/commit/9f302a455aaefd0b5397d4f9f5183f22af88b2f1, and the file isn't included in the package itself. This adds it to the package (I think).
2015-01-04renamed to requirements.txtPatrick
2015-01-04attempting auto-deploy againPatrick
2015-01-04Rename requirements to requirements.txtPatrick
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 04:41:37 +0000