diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f157553145..9f4ebf6394 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -38,15 +38,15 @@ repos: - id: absolufy-imports - repo: https://github.com/psf/black - rev: 22.12.0 + rev: 23.1.0 hooks: - id: black-jupyter - repo: https://github.com/asottile/blacken-docs - rev: v1.12.1 + rev: 1.13.0 hooks: - id: blacken-docs - additional_dependencies: [black==22.12.0] + additional_dependencies: [black==23.1.0] - repo: https://github.com/asottile/yesqa rev: v1.4.0 @@ -76,7 +76,7 @@ repos: args: ["--python-version=3.10"] - repo: https://github.com/nbQA-dev/nbQA - rev: 1.6.0 + rev: 1.6.1 hooks: - id: nbqa-pyupgrade additional_dependencies: [pyupgrade==3.3.1] diff --git a/docs/exts/xref.py b/docs/exts/xref.py index 7a0c2278bc..755ece671b 100644 --- a/docs/exts/xref.py +++ b/docs/exts/xref.py @@ -34,12 +34,10 @@ def xref(typ, rawtext, text, lineno, inliner, options=None, content=None): def get_refs(app): - xref.links = app.config.xref_links def setup(app): - app.add_config_value('xref_links', {}, True) app.add_role('xref', xref) app.connect("builder-inited", get_refs) diff --git a/src/pyhf/modifiers/normsys.py b/src/pyhf/modifiers/normsys.py index 5f07a7df5b..e536bfe7a4 100644 --- a/src/pyhf/modifiers/normsys.py +++ b/src/pyhf/modifiers/normsys.py @@ -72,7 +72,6 @@ class normsys_combined: def __init__( self, modifiers, pdfconfig, builder_data, interpcode='code1', batch_size=None ): - self.interpcode = interpcode assert self.interpcode in ['code1', 'code4'] diff --git a/src/pyhf/modifiers/staterror.py b/src/pyhf/modifiers/staterror.py index 623520937d..919811c9fe 100644 --- a/src/pyhf/modifiers/staterror.py +++ b/src/pyhf/modifiers/staterror.py @@ -136,7 +136,6 @@ class staterror_combined: op_code = 'multiplication' def __init__(self, modifiers, pdfconfig, builder_data, batch_size=None): - default_backend = pyhf.default_backend self.batch_size = batch_size diff --git a/src/pyhf/optimize/mixins.py b/src/pyhf/optimize/mixins.py index 4738aebe96..c0e689c512 100644 --- a/src/pyhf/optimize/mixins.py +++ b/src/pyhf/optimize/mixins.py @@ -41,7 +41,6 @@ def _internal_minimize( options={}, par_names=None, ): - minimizer = self._get_minimizer( func, x0, diff --git a/src/pyhf/optimize/opt_minuit.py b/src/pyhf/optimize/opt_minuit.py index de0d5e98e4..49ee177ae6 100644 --- a/src/pyhf/optimize/opt_minuit.py +++ b/src/pyhf/optimize/opt_minuit.py @@ -49,7 +49,6 @@ def _get_minimizer( do_grad=False, par_names=None, ): - fixed_vals = fixed_vals or [] # Minuit wants True/False for each parameter fixed_bools = [False] * len(init_pars) @@ -82,7 +81,6 @@ def _minimize( fixed_vals=None, options={}, ): - """ Same signature as :func:`scipy.optimize.minimize`. diff --git a/src/pyhf/parameters/paramview.py b/src/pyhf/parameters/paramview.py index 086d1e0d00..cac057f8b5 100644 --- a/src/pyhf/parameters/paramview.py +++ b/src/pyhf/parameters/paramview.py @@ -58,7 +58,6 @@ class ParamViewer: """ def __init__(self, shape, par_map, par_selection): - default_backend = pyhf.default_backend batch_size = shape[0] if len(shape) > 1 else None diff --git a/tests/test_import.py b/tests/test_import.py index 53165f5c48..5a164d7463 100644 --- a/tests/test_import.py +++ b/tests/test_import.py @@ -308,7 +308,6 @@ def test_import_histosys(): def test_import_filecache(mocker): - mocker.patch("pyhf.readxml.uproot.open", wraps=uproot.open) pyhf.readxml.clear_filecache() @@ -458,7 +457,6 @@ def test_process_modifiers(mocker, caplog): def test_import_validation_exception(mocker, caplog): - mocker.patch( 'pyhf.schema.validate', side_effect=pyhf.exceptions.InvalidSpecification( diff --git a/validation/standard_hypo_test_demo.py b/validation/standard_hypo_test_demo.py index 501004a27c..e95533a32c 100644 --- a/validation/standard_hypo_test_demo.py +++ b/validation/standard_hypo_test_demo.py @@ -15,7 +15,6 @@ def standard_hypo_test_demo( sb_model_name="ModelConfig", data_name="obsData", ): - file = ROOT.TFile.Open(infile) workspace = file.Get(workspace_name) sb_model = workspace.obj(sb_model_name)