From 1ee981522c6cdc1116c09aee8c9468ddaad52d84 Mon Sep 17 00:00:00 2001
From: Tamas Gal <tgal@km3net.de>
Date: Mon, 24 Aug 2020 22:12:43 +0200
Subject: [PATCH] Switch to uproot4
---
km3io/gseagen.py | 2 +-
km3io/offline.py | 2 +-
km3io/online.py | 2 +-
km3io/rootio.py | 2 +-
km3io/tools.py | 2 +-
km3io/utils/kprinttree.py | 2 +-
requirements/install.txt | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/km3io/gseagen.py b/km3io/gseagen.py
index 21772ab..8d73c33 100644
--- a/km3io/gseagen.py
+++ b/km3io/gseagen.py
@@ -3,7 +3,7 @@
# Filename: gseagen.py
# Author: Johannes Schumann <jschumann@km3net.de>
-import uproot
+import uproot4 as uproot
import numpy as np
import warnings
from .rootio import Branch, BranchMapper
diff --git a/km3io/offline.py b/km3io/offline.py
index 37241f6..594fdc7 100644
--- a/km3io/offline.py
+++ b/km3io/offline.py
@@ -1,6 +1,6 @@
import binascii
from collections import namedtuple
-import uproot
+import uproot4 as uproot
import warnings
import numba as nb
import awkward1 as ak1
diff --git a/km3io/online.py b/km3io/online.py
index 3440a40..1775f8f 100644
--- a/km3io/online.py
+++ b/km3io/online.py
@@ -1,6 +1,6 @@
import binascii
import os
-import uproot
+import uproot4 as uproot
import numpy as np
import numba as nb
diff --git a/km3io/rootio.py b/km3io/rootio.py
index 6e30552..69c6f45 100644
--- a/km3io/rootio.py
+++ b/km3io/rootio.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python3
import numpy as np
import awkward1 as ak
-import uproot
+import uproot4 as uproot
from .tools import unfold_indices
diff --git a/km3io/tools.py b/km3io/tools.py
index 6e6864f..e475ec3 100644
--- a/km3io/tools.py
+++ b/km3io/tools.py
@@ -2,7 +2,7 @@
import numba as nb
import numpy as np
import awkward1 as ak1
-import uproot
+import uproot4 as uproot
from km3io.definitions import reconstruction as krec
from km3io.definitions import trigger as ktrg
diff --git a/km3io/utils/kprinttree.py b/km3io/utils/kprinttree.py
index 7b5af9d..47d38c5 100644
--- a/km3io/utils/kprinttree.py
+++ b/km3io/utils/kprinttree.py
@@ -14,7 +14,7 @@ Options:
-h --help Show this screen.
"""
-import uproot
+import uproot4 as uproot
def print_tree(filename):
diff --git a/requirements/install.txt b/requirements/install.txt
index e080859..7ada850 100644
--- a/requirements/install.txt
+++ b/requirements/install.txt
@@ -1,5 +1,5 @@
docopt
numba>=0.50
awkward1>=0.3.1
-uproot>=3.11.1
+uproot4
setuptools_scm
--
GitLab