From c6ef132ebb68758b139aea95809e6c209e8132ea Mon Sep 17 00:00:00 2001 From: Haochen Tong Date: Sun, 7 Apr 2019 20:54:55 +0200 Subject: [PATCH 1/4] Fix copy-paste mistake BitBucket -> GitLab --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 05848d1bc224733dd7fe491100170a1dd4801c65 Mon Sep 17 00:00:00 2001 From: lilydjwg Date: Mon, 8 Apr 2019 11:42:40 +0800 Subject: [PATCH 2/4] test: has pytest-asyncio fix released? https://github.com/pytest-dev/pytest-asyncio/issues/104 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9302c7b..0c8731d 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 pytest-xdist flaky structlog script: pytest env: global: From 0f101bda4dd9edc046108438f745e71f6ed7a427 Mon Sep 17 00:00:00 2001 From: lilydjwg Date: Mon, 8 Apr 2019 11:45:19 +0800 Subject: [PATCH 3/4] test: is pytest-xdist necessary? --- .travis.yml | 2 +- setup.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0c8731d..aa2c80c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ python: - "3.7" - "nightly" - "pypy3.5" -install: pip install -U $DEPS pytest pytest-asyncio pytest-xdist flaky structlog +install: pip install -U $DEPS pytest pytest-asyncio flaky structlog script: pytest env: global: 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 = { From cc763205e81331f829e80c01a593774989a09cf4 Mon Sep 17 00:00:00 2001 From: lilydjwg Date: Mon, 8 Apr 2019 12:15:49 +0800 Subject: [PATCH 4/4] test: don't raise RuntimeError for rate limited logs --- tests/conftest.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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])