diff --git a/.travis.yml b/.travis.yml index 9302c7b..aa2c80c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ python: - "3.7" - "nightly" - "pypy3.5" -install: pip install -U $DEPS "pytest<4.1" pytest-asyncio pytest-xdist flaky structlog +install: pip install -U $DEPS pytest pytest-asyncio flaky structlog script: pytest env: global: diff --git a/README.rst b/README.rst index e83cc98..01ebfa4 100644 --- a/README.rst +++ b/README.rst @@ -343,7 +343,7 @@ branch Which branch to track? Default: ``master``. use_max_tag - Set this to ``true`` to check for the max tag on BitBucket. Will return the biggest one + Set this to ``true`` to check for the max tag on GitLab. Will return the biggest one sorted by ``pkg_resources.parse_version``. host diff --git a/setup.py b/setup.py index e4951c1..8853f61 100755 --- a/setup.py +++ b/setup.py @@ -28,7 +28,6 @@ setup( tests_require = [ 'pytest', 'pytest-asyncio', - 'pytest-xdist', 'flaky', ], entry_points = { diff --git a/tests/conftest.py b/tests/conftest.py index 39e11f7..84b2c65 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -65,7 +65,8 @@ def raise_on_logger_msg(): if method_name in ('warning', 'error'): if 'exc_info' in event_dict: raise event_dict['exc_info'] - raise RuntimeError(event_dict['event']) + if not event_dict['event'].startswith('rate limited'): + raise RuntimeError(event_dict['event']) return event_dict['event'] structlog.configure([proc])