Merge pull request #442 from chrisburr/minimal-testing

Allow tests to be ran with minimal dependencies

appveyor.yml

@@ -41,17 +41,18 @@ environment:
  NUMPY: "numpy>=1.15"
 
 install:
+ - "SET PATH=%PYTHON%;%PATH%"
  - "python --version"
 
 build_script:
  - "python -m pip install --upgrade pip"
- - "pip install %NUMPY%"
- - "pip install \"awkward>=0.12.0,<1.0\""
+ - "python -m pip install %NUMPY%"
+ - "python -m pip install \"awkward>=0.12.0,<1.0\""
  - "python -c \"import awkward; print(awkward.__version__)\""
- - "pip install \"uproot-methods>=0.7.0\""
+ - "python -m pip install \"uproot-methods>=0.7.0\""
  - "python -c \"import uproot_methods; print(uproot_methods.__version__)\""
- - "pip install cachetools lz4 zstandard mock xxhash"
- - "pip install -i https://pypi.anaconda.org/carlkl/simple backports.lzma"
- - "pip install pytest pytest-runner pandas requests"
+ - "python -m pip install cachetools lz4 zstandard mock xxhash"
+ - "IF \"%PYTHON_VERSION%\"==\"2.7.10\" ( python -m pip install -i https://pypi.anaconda.org/carlkl/simple backports.lzma )"
+ - "python -m pip install pytest pytest-runner pandas requests"
  - "curl -fsS -o tests/samples/Event.root http://scikit-hep.org/uproot/examples/Event.root"
- - "pytest -v tests"
+ - "python -m pytest -v tests"

tests/test_compression.py

@@ -2,8 +2,16 @@
 
 # BSD 3-Clause License; see https://github.com/scikit-hep/uproot/blob/master/LICENSE
 
+import pytest
+try:
+ import lzma
+except ImportError:
+ lzma = pytest.importorskip('backports.lzma')
+lz4 = pytest.importorskip('lz4')
+zstandard = pytest.importorskip('zstandard')
 import uproot
 
+
 class Test(object):
  def test_compression_identity(self):
  assert uproot.open("tests/samples/Zmumu-zlib.root").compression.algoname == "zlib"

tests/test_http.py

@@ -4,7 +4,7 @@
 
 import pytest
 import mock
-from requests.exceptions import HTTPError
+HTTPError = pytest.importorskip('requests.exceptions').HTTPError
 
 import uproot
 

tests/test_issues.py

@@ -248,6 +248,7 @@ def test_issue187(self):
  assert t.array("V0s.fEtaPos")[-3].tolist() == [-0.390625, 0.046875]
 
  def test_issue213(self):
+ pytest.importorskip("xxhash")
  t = uproot.open("tests/samples/issue213.root")["T"]
  assert t["fMCHits.fPosition"].array().x.tolist() == [
  [], [], [], [], [], [], [], [42.17024612426758, 50.63192367553711],

tests/test_tree.py

@@ -595,12 +595,13 @@ def test_tree_lazy_cached(self):
  @pytest.mark.parametrize("use_http", [False, True])
  def test_hist_in_tree(self, use_http):
  if use_http:
+ pytest.importorskip("requests")
+ tree = uproot.open("http://scikit-hep.org/uproot/examples/Event.root")["T"]
+ else:
  path = os.path.join("tests", "samples", "Event.root")
  if not os.path.exists(path):
  raise pytest.skip()
  tree = uproot.open(path)["T"]
- else:
- tree = uproot.open("http://scikit-hep.org/uproot/examples/Event.root")["T"]
  check = [0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0,
  0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 1.0, 1.0,
  1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,
@@ -625,12 +626,13 @@ def test_branch_auto_interpretation(self, use_http):
  b'fTriggerBits.TObject'
  ]
  if use_http:
+ pytest.importorskip("requests")
+ tree = uproot.open("http://scikit-hep.org/uproot/examples/Event.root")["T"]
+ else:
  path = os.path.join("tests", "samples", "Event.root")
  if not os.path.exists(path):
  raise pytest.skip()
  tree = uproot.open(path)["T"]
- else:
- tree = uproot.open("http://scikit-hep.org/uproot/examples/Event.root")["T"]
  branches_without_interp = [b.name for b in tree.allvalues() if b.interpretation is None]
  assert branches_without_interp == known_branches_without_interp
  assert tree.array("fTracks.fTArray[3]", entrystop=10)[5][10].tolist() == [11.03951644897461, 19.40645980834961, 34.54059982299805]

tests/test_versions.py

@@ -2,14 +2,16 @@
 
 # BSD 3-Clause License; see https://github.com/scikit-hep/uproot/blob/master/LICENSE
 
+import pytest
 try:
  import lzma
 except ImportError:
- from backports import lzma
-import lz4
+ lzma = pytest.importorskip('backports.lzma')
+lz4 = pytest.importorskip('lz4')
 
 import uproot
 
+
 class Test(object):
  sample = {
  b"n": [0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4],

uproot/interp/auto.py

@@ -52,9 +52,9 @@ def _ftype2dtype(fType, awkward):
  elif fType in (uproot.const.kBits, uproot.const.kUInt, uproot.const.kCounter):
  return awkward.numpy.dtype(">u4")
  elif fType == uproot.const.kLong:
- return awkward.numpy.dtype(awkward.numpy.long).newbyteorder(">")
+ return awkward.numpy.dtype(">i8")
  elif fType == uproot.const.kULong:
- return awkward.numpy.dtype(">u" + repr(awkward.numpy.dtype(awkward.numpy.long).itemsize))
+ return awkward.numpy.dtype(">u8")
  elif fType == uproot.const.kLong64:
  return awkward.numpy.dtype(">i8")
  elif fType == uproot.const.kULong64: