chore: Make tests pass pyflakes (#718)

* Make the tests pass pyflakes
* Add testing of 'pyflakes tests/' to the CI

Author: matthewfeickert

.github/workflows/ci.yml

@@ -30,7 +30,8 @@ jobs:
     - name: Lint with Pyflakes
       if: matrix.python-version == 3.7 && matrix.os == 'ubuntu-latest'
       run: |
-        pyflakes src
+        python -m pyflakes src/
+        python -m pyflakes tests/
     - name: Lint with Black
       if: matrix.python-version == 3.7 && matrix.os == 'ubuntu-latest'
       run: |

tests/conftest.py

@@ -1,4 +1,3 @@
-import torch  # Solves "cannot load any more object with static TLS" (thread local storage) error
 import pytest
 import pyhf
 import tensorflow as tf
@@ -74,7 +73,9 @@ def backend(request):
 
     if skip_backend and (param_id in only_backends):
         raise ValueError(
-            "Must specify skip_{param} or only_{param} but not both!".format(param=pid)
+            "Must specify skip_{param} or only_{param} but not both!".format(
+                param=param_id
+            )
         )
 
     if skip_backend:

tests/contrib/test_viz.py

@@ -2,14 +2,11 @@
 import json
 import pyhf.contrib.viz.brazil as brazil
 import matplotlib.pyplot as plt
-import numpy as np
-from matplotlib.testing.decorators import image_comparison
 
 
 @pytest.mark.mpl_image_compare
 def test_brazil():
     data = json.load(open('tests/contrib/hypotestresults.json'))
     fig, ax = plt.subplots(1, 1)
-    testmus = np.linspace(0, 5)
     brazil.plot_results(ax, data['testmus'], data['results'], test_size=0.05)
     return fig

tests/test_events.py

@@ -1,4 +1,3 @@
-import pytest
 import pyhf.events as events
 import mock
 

tests/test_export.py

@@ -264,8 +264,6 @@ def test_export_sample(mocker, spec):
     channelspec = spec['channels'][0]
     channelname = channelspec['name']
     samplespec = channelspec['samples'][1]
-    samplename = samplespec['name']
-    sampledata = samplespec['data']
 
     mocker.patch('pyhf.writexml.build_modifier', return_value=ET.Element("Modifier"))
     mocker.patch('pyhf.writexml._ROOT_DATA_FILE')
@@ -292,7 +290,7 @@ def test_export_sample_zerodata(mocker, spec):
     # make sure no RuntimeWarning, https://stackoverflow.com/a/45671804
     with pytest.warns(None) as record:
         for modifierspec in samplespec['modifiers']:
-            modifier = pyhf.writexml.build_modifier(
+            pyhf.writexml.build_modifier(
                 {'measurements': [{'config': {'parameters': []}}]},
                 modifierspec,
                 channelname,
@@ -309,7 +307,6 @@ def test_export_sample_zerodata(mocker, spec):
 )
 def test_export_channel(mocker, spec):
     channelspec = spec['channels'][0]
-    channelname = channelspec['name']
 
     mocker.patch('pyhf.writexml.build_data', return_value=ET.Element("Data"))
     mocker.patch('pyhf.writexml.build_sample', return_value=ET.Element("Sample"))

tests/test_import.py

@@ -209,19 +209,7 @@ def test_import_histosys():
     }
     pdf = pyhf.Model(spec, poiname='SigXsecOverSM')
 
-    data = [
-        binvalue
-        for k in pdf.spec['channels']
-        for binvalue in next(
-            obs for obs in parsed_xml['observations'] if obs['name'] == k['name']
-        )['data']
-    ] + pdf.config.auxdata
-
     channels = {channel['name']: channel for channel in pdf.spec['channels']}
-    samples = {
-        channel['name']: [sample['name'] for sample in channel['samples']]
-        for channel in pdf.spec['channels']
-    }
 
     assert channels['channel2']['samples'][0]['modifiers'][0]['type'] == 'lumi'
     assert channels['channel2']['samples'][0]['modifiers'][1]['type'] == 'histosys'
@@ -263,19 +251,7 @@ def test_import_shapesys():
     }
     pdf = pyhf.Model(spec, poiname='SigXsecOverSM')
 
-    data = [
-        binvalue
-        for k in pdf.spec['channels']
-        for binvalue in next(
-            obs for obs in parsed_xml['observations'] if obs['name'] == k['name']
-        )['data']
-    ] + pdf.config.auxdata
-
     channels = {channel['name']: channel for channel in pdf.spec['channels']}
-    samples = {
-        channel['name']: [sample['name'] for sample in channel['samples']]
-        for channel in pdf.spec['channels']
-    }
 
     assert channels['channel1']['samples'][1]['modifiers'][0]['type'] == 'lumi'
     assert channels['channel1']['samples'][1]['modifiers'][1]['type'] == 'shapesys'

tests/test_infer.py

@@ -1,4 +1,3 @@
-import os
 import pytest
 import pyhf
 

tests/test_interpolate.py

@@ -73,14 +73,14 @@ def test_interpolator_subscription(interpcode, random_histosets_alphasets_pair):
     # inject into our interpolator class
     interpolator_cls = pyhf.interpolators.get(interpcode)
     with mock.patch('{0:s}._precompute'.format(interpolator_cls.__module__)) as m:
-        interpolator = interpolator_cls(histogramssets.tolist(), subscribe=False)
+        interpolator_cls(histogramssets.tolist(), subscribe=False)
         assert m.call_count == 1
         assert m not in pyhf.events.__events.get(ename, [])
         pyhf.events.trigger(ename)()
         assert m.call_count == 1
 
     with mock.patch('{0:s}._precompute'.format(interpolator_cls.__module__)) as m:
-        interpolator = interpolator_cls(histogramssets.tolist(), subscribe=True)
+        interpolator_cls(histogramssets.tolist(), subscribe=True)
         assert m.call_count == 1
         assert m in pyhf.events.__events.get(ename, [])
         pyhf.events.trigger(ename)()

tests/test_modifiers.py

@@ -1,6 +1,5 @@
 import pytest
 import inspect
-from six import with_metaclass
 
 import pyhf
 
@@ -121,13 +120,13 @@ class myCustomModifier(object):
     with pytest.raises(TypeError):
 
         @modifier(name=1.5)
-        class myCustomModifier(object):
+        class myCustomModifierTypeError(object):
             pass
 
     with pytest.raises(ValueError):
 
         @modifier(unused='arg')
-        class myCustomModifier(object):
+        class myCustomModifierValueError(object):
             pass
 
 
@@ -138,7 +137,7 @@ def test_registry_name_clash():
     with pytest.raises(KeyError):
 
         @modifier(name='histosys')
-        class myCustomModifier(object):
+        class myCustomModifierKeyError(object):
             pass
 
     with pytest.raises(KeyError):

tests/test_pdf.py

@@ -171,7 +171,6 @@ def test_pdf_integration_staterror(backend):
         ]
     }
     pdf = pyhf.Model(spec)
-    par = pdf.config.par_slice('stat_firstchannel')
     par_set = pdf.config.param_set('stat_firstchannel')
     tensorlib, _ = backend
     uncerts = tensorlib.astensor([[12.0, 12.0], [5.0, 5.0]])
@@ -600,4 +599,4 @@ def test_sample_wrong_bins():
         ]
     }
     with pytest.raises(pyhf.exceptions.InvalidModel):
-        pdf = pyhf.Model(spec)
+        pyhf.Model(spec)