From 8713b8670d6010008891180e3fd3095ec729961d Mon Sep 17 00:00:00 2001 From: halcy Date: Sun, 11 Feb 2024 15:52:06 +0200 Subject: [PATCH] another attempt at unfucking the CI --- .circleci/config.yml | 6 +++--- pyproject.toml | 10 ++++++++++ tests/test_streaming.py | 6 ++++++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3b9c9b5..d11ca33 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,7 @@ jobs: - checkout - run: name: "Install test deps" - command: "pip install .[test,webpush,blurhash]" + command: "pip install .[test_old,webpush,blurhash]" - run: name: "Run tests" command: "python setup.py pytest --addopts '--junitxml=tests/result.xml'" @@ -20,7 +20,7 @@ jobs: - checkout - run: name: "Install test deps" - command: "pip install .[test,webpush,blurhash]" + command: "pip install .[test_old,webpush,blurhash]" - run: name: "Run tests" command: "python setup.py pytest --addopts '--junitxml=tests/result.xml'" @@ -33,7 +33,7 @@ jobs: - checkout - run: name: "Install test deps" - command: "pip install .[test,webpush,blurhash]" + command: "pip install .[test_old,webpush,blurhash]" - run: name: "Run tests" command: "python setup.py pytest --addopts '--junitxml=tests/result.xml'" diff --git a/pyproject.toml b/pyproject.toml index 9f35031..4d40950 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -48,6 +48,16 @@ test = [ 'pytz', 'pytest-retry' ] +test_old = [ + 'pytest', + 'pytest-runner', + 'pytest-cov', + 'vcrpy', + 'pytest-vcr', + 'pytest-mock', + 'requests-mock', + 'pytz', +] [project.urls] Repository="https://github.com/halcy/Mastodon.py" diff --git a/tests/test_streaming.py b/tests/test_streaming.py index a11e24b..d6a3e96 100644 --- a/tests/test_streaming.py +++ b/tests/test_streaming.py @@ -19,6 +19,12 @@ def vcr(vcr): vcr.match_on = ['path'] return vcr +@pytest.fixture(scope='module') +def vcr_config(): + return { + "match_on": ["path"], + } + def patch_streaming(): # For monkeypatching so we can make vcrpy better import vcr.stubs