From b28818a121b2b1b9af3940d161b5d409ea6bc2be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jim=20Br=C3=A4nnlund?= Date: Sat, 27 May 2023 20:25:56 +0200 Subject: [PATCH] Release v3.0.0 (#69) --- .github/workflows/publish.yml | 2 +- src/pytest_metadata/plugin.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 77ab552..54c4184 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -8,7 +8,7 @@ on: jobs: publish: - if: github.repository == 'pytest-dev/pytest-base-url' + if: github.repository == 'pytest-dev/pytest-metadata' runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 diff --git a/src/pytest_metadata/plugin.py b/src/pytest_metadata/plugin.py index 1ec1071..978297c 100644 --- a/src/pytest_metadata/plugin.py +++ b/src/pytest_metadata/plugin.py @@ -94,6 +94,7 @@ def pytest_configure(config): config.stash[metadata_key].update( json.loads(config.getoption("metadata_from_json")) ) + if config.getoption("metadata_from_json_file"): with open(config.getoption("metadata_from_json_file"), "r") as json_file: config.stash[metadata_key].update(json.load(json_file))