Fixed - PyTest get_marker warning fix https://github.com/Scony/pytest-timeouts/pull/36 get_marker was incorrect selected on pytest 3.10.X
1.2.0
Added - Add support for pytest 4 - Add code of conduct - Add CHANGELOG.md Changed - Add validation of timeout order on startup - Move data from setup.py to setup.cfg Fixed - Correct README.md