Skip to content

Commit 9a2c8a6

Browse files
kratsgmatthewfeickert
authored andcommitted
fix and use context manager
1 parent 2ca4907 commit 9a2c8a6

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ classifiers = [
4545
dependencies = [
4646
"click>=8.0.0", # for console scripts
4747
"importlib_resources>=1.4.0; python_version < '3.9'", # for resources in schema
48-
"typing_extensions; python_version < '3.11'" # for typing
48+
"typing_extensions; python_version < '3.11'", # for typing
4949
"jsonpatch>=1.15",
5050
"jsonschema>=4.15.0", # for utils
5151
"pyyaml>=5.1", # for parsing CLI equal-delimited options

tests/test_upgrade.py

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,21 @@ def test_upgrade_bad_version(datadir):
1111

1212

1313
def test_upgrade_to_latest(datadir):
14-
ws = json.load(open(datadir.joinpath("workspace_1.0.0.json"), encoding="utf-8"))
14+
with datadir.joinpath("workspace_1.0.0.json").open(encoding="utf-8") as fp:
15+
ws = json.load(fp)
1516
pyhf.schema.upgrade().workspace(ws)
1617

17-
ps = json.load(open(datadir.joinpath("workspace_1.0.0.json"), encoding="utf-8"))
18+
with datadir.joinpath("workspace_1.0.0.json").open(encoding="utf-8") as fp:
19+
ps = json.load(fp)
1820
pyhf.schema.upgrade().patchset(ps)
1921

2022

2123
def test_1_0_0_workspace(datadir, caplog, monkeypatch):
2224
"""
2325
Test upgrading a workspace from 1.0.0 to 1.0.1
2426
"""
25-
spec = json.load(open(datadir.joinpath("workspace_1.0.0.json"), encoding="utf-8"))
27+
with datadir.joinpath("workspace_1.0.0.json").open(encoding="utf-8") as fp:
28+
spec = json.load(fp)
2629

2730
monkeypatch.setitem(pyhf.schema.versions, 'workspace.json', '1.0.1')
2831
with caplog.at_level(logging.INFO, 'pyhf.schema'):
@@ -39,7 +42,8 @@ def test_1_0_0_patchset(datadir, caplog, monkeypatch):
3942
"""
4043
Test upgrading a patchset from 1.0.0 to 1.0.1
4144
"""
42-
spec = json.load(open(datadir.joinpath("patchset_1.0.0.json"), encoding="utf-8"))
45+
with datadir.joinpath("patchset_1.0.0.json").open(encoding="utf-8") as fp:
46+
spec = json.load(fp)
4347

4448
monkeypatch.setitem(pyhf.schema.versions, 'patchset.json', '1.0.1')
4549
with caplog.at_level(logging.INFO, 'pyhf.schema'):
@@ -56,7 +60,8 @@ def test_1_0_1_workspace(datadir):
5660
"""
5761
Test upgrading a workspace from 1.0.1 to 1.0.1
5862
"""
59-
spec = json.load(open(datadir.joinpath("workspace_1.0.1.json"), encoding="utf-8"))
63+
with datadir.joinpath("workspace_1.0.1.json").open(encoding="utf-8") as fp:
64+
spec = json.load(fp)
6065

6166
new_spec = pyhf.schema.upgrade(to_version='1.0.1').workspace(spec)
6267
assert new_spec['version'] == '1.0.1'
@@ -66,7 +71,8 @@ def test_1_0_1_patchset(datadir):
6671
"""
6772
Test upgrading a patchset from 1.0.1 to 1.0.1
6873
"""
69-
spec = json.load(open(datadir.joinpath("patchset_1.0.1.json"), encoding="utf-8"))
74+
with datadir.joinpath("patchset_1.0.1.json").open(encoding="utf-8") as fp:
75+
spec = json.load(fp)
7076

7177
new_spec = pyhf.schema.upgrade(to_version='1.0.1').patchset(spec)
7278
assert new_spec['version'] == '1.0.1'

0 commit comments

Comments
 (0)