fix: Use uproot3 namespace for patch release v0.5.4

* Install uproot3 in xmlio extra
* import uproot3 as uproot

Author: matthewfeickert

setup.py

@@ -8,8 +8,8 @@
     ],
     'torch': ['torch~=1.2'],
     'jax': ['jax~=0.2.4', 'jaxlib~=0.1.56'],
-    'xmlio': ['uproot~=3.6'],  # Future proof against uproot4 API changes
-    'minuit': ['iminuit~=1.4.3'],  # v1.5.0 breaks pyhf for 32b TensorFlow and PyTorch
+    'xmlio': ['uproot3~=3.14'],  # Future proof against uproot4 API changes
+    'minuit': ['iminuit~=1.5.3'],
 }
 extras_require['backends'] = sorted(
     set(
@@ -19,8 +19,8 @@
         + extras_require['minuit']
     )
 )
-extras_require['contrib'] = sorted(set(['matplotlib', 'requests']))
-extras_require['lint'] = sorted(set(['pyflakes', 'black']))
+extras_require['contrib'] = sorted({'matplotlib', 'requests'})
+extras_require['lint'] = sorted({'flake8', 'black'})
 
 extras_require['test'] = sorted(
     set(
@@ -40,25 +40,22 @@
             'papermill~=2.0',
             'nteract-scrapbook~=0.2',
             'jupyter',
-            'uproot~=3.3',
             'graphviz',
             'jsonpatch',
         ]
     )
 )
 extras_require['docs'] = sorted(
-    set(
-        [
-            'sphinx>=3.1.2',
-            'sphinxcontrib-bibtex',
-            'sphinx-click',
-            'sphinx_rtd_theme',
-            'nbsphinx',
-            'ipywidgets',
-            'sphinx-issues',
-            'sphinx-copybutton>0.2.9',
-        ]
-    )
+    {
+        'sphinx>=3.1.2',
+        'sphinxcontrib-bibtex',
+        'sphinx-click',
+        'sphinx_rtd_theme',
+        'nbsphinx',
+        'ipywidgets',
+        'sphinx-issues',
+        'sphinx-copybutton>0.2.9',
+    }
 )
 extras_require['develop'] = sorted(
     set(

src/pyhf/cli/rootio.py

@@ -32,7 +32,7 @@ def cli():
 def xml2json(entrypoint_xml, basedir, output_file, track_progress):
     """Entrypoint XML: The top-level XML file for the PDF definition."""
     try:
-        import uproot
+        import uproot3 as uproot
 
         assert uproot
     except ImportError:
@@ -61,7 +61,7 @@ def xml2json(entrypoint_xml, basedir, output_file, track_progress):
 def json2xml(workspace, output_dir, specroot, dataroot, resultprefix, patch):
     """Convert pyhf JSON back to XML + ROOT files."""
     try:
-        import uproot
+        import uproot3 as uproot
 
         assert uproot
     except ImportError:

src/pyhf/readxml.py

@@ -6,7 +6,7 @@
 import xml.etree.ElementTree as ET
 import numpy as np
 import tqdm
-import uproot
+import uproot3 as uproot
 import re
 
 log = logging.getLogger(__name__)

src/pyhf/writexml.py

@@ -5,8 +5,8 @@
 import pkg_resources
 import xml.etree.cElementTree as ET
 import numpy as np
-import uproot
-from uproot_methods.classes import TH1
+import uproot3 as uproot
+from uproot3_methods.classes import TH1
 
 from .mixins import _ChannelSummaryMixin
 

tests/test_import.py

@@ -1,7 +1,7 @@
 import pyhf
 import pyhf.readxml
 import numpy as np
-import uproot
+import uproot3 as uproot
 from pathlib import Path
 import pytest
 import xml.etree.cElementTree as ET