Merge py-uproot4 into py-uproot (#22831)

2 files changed, 34 insertions, 5 deletions

diff --git a/var/spack/repos/builtin/packages/py-uproot/package.py b/var/spack/repos/builtin/packages/py-uproot/package.py
index 7cd64a580e..1cf9067267 100644
--- a/var/spack/repos/builtin/packages/py-uproot/package.py
+++ b/var/spack/repos/builtin/packages/py-uproot/package.py
@@ -19,8 +19,29 @@ class PyUproot(PythonPackage):
     homepage = "https://github.com/scikit-hep/uproot4"
     pypi     = "uproot/uproot-4.0.6.tar.gz"
 
+    maintainers = ['vvolkl']
+
+    tags = ['hep']
+
     version('4.0.6', sha256='1bea2ccc899c6959fb2af69d7e5d1e2df210caab30d3510e26f3fc07c143c37e')
 
+    variant('xrootd', default=True,
+            description='Build with xrootd support ')
+    variant('lz4', default=True,
+            description='Build with support for reading '
+                        'lz4-compressed rootfiles ')
+
+    variant('zstd', default=True,
+            description='Build with support for reading '
+                        'zstd-compressed rootfiles ')
+
     depends_on('python@2.6:2.999,3.5:', type=('build', 'run'))
     depends_on('py-setuptools', type='build')
     depends_on('py-numpy', type=('build', 'run'))
+
+    depends_on('xrootd', when="+xrootd")
+
+    depends_on('lz4', when="+lz4")
+    depends_on('xxhash', when="+lz4")
+
+    depends_on('zstd', when="+zstd")
diff --git a/var/spack/repos/builtin/packages/py-uproot4/package.py b/var/spack/repos/builtin/packages/py-uproot4/package.py
index 78bd21309a..e7d6610b3f 100644
--- a/var/spack/repos/builtin/packages/py-uproot4/package.py
+++ b/var/spack/repos/builtin/packages/py-uproot4/package.py
@@ -7,7 +7,9 @@ from spack import *
 
 
 class PyUproot4(PythonPackage):
-    """ROOT I/O in pure Python and NumPy."""
+    """DEPRECATED! This package was renamed to py-uproot.
+
+    ROOT I/O in pure Python and NumPy."""
 
     homepage = "https://uproot4.readthedocs.io"
     git      = "https://github.com/scikit-hep/uproot4"
@@ -17,10 +19,16 @@ class PyUproot4(PythonPackage):
 
     tags = ['hep']
 
-    version('master', branch='master')
-    version('4.0.2',    sha256='8145af29788cbe6bf0ee279a7f176159f3eee801641ead4ad6e627f8c4dff0a9')
-    version('0.1.2', sha256='b32dbffadc87bc5707ee0093964d2ce4a5ccfd521b17bbf10732afc25b820d82')
-    version('0.0.27', sha256='de87555937332998b476f3e310392962bc983bddc008ed2b3c07a25c0379c4c9')
+    version('master', branch='master', deprecated=True)
+    version('4.0.2',
+            sha256='8145af29788cbe6bf0ee279a7f176159f3eee801641ead4ad6e627f8c4dff0a9',
+            deprecated=True)
+    version('0.1.2',
+            sha256='b32dbffadc87bc5707ee0093964d2ce4a5ccfd521b17bbf10732afc25b820d82',
+            deprecated=True)
+    version('0.0.27',
+            sha256='de87555937332998b476f3e310392962bc983bddc008ed2b3c07a25c0379c4c9',
+            deprecated=True)
 
     variant('xrootd', default=True,
             description='Build with xrootd support ')