diff --git a/pip/oamap.file b/pip/oamap.file deleted file mode 100644 index 2ae8345f3ff..00000000000 --- a/pip/oamap.file +++ /dev/null @@ -1,2 +0,0 @@ -Requires: py2-numpy py3-numba py2-uproot py2-h5py py3-numpy py2-cachetools -Patch0: py2-oamap-Const2Literal diff --git a/pip/requirements.txt b/pip/requirements.txt index 2eacea04993..4b211adeacc 100644 --- a/pip/requirements.txt +++ b/pip/requirements.txt @@ -149,7 +149,6 @@ numpy==1.17.5 ; python_version>'3.0' #NO_AUTO_UPDATE:2: numpy versions >1.15.1 fail on aarch64 numpy==1.15.1 ; python_version<'3.0' ; platform_machine=='aarch64' numpy==1.15.1 ; python_version>'3.0' ; platform_machine=='aarch64' -oamap==0.12.4 onnx==1.6.0 onnxruntime==1.2.0 ; python_version>'3.0' opt-einsum==2.3.2 ; python_version<'3.0' diff --git a/py2-oamap-Const2Literal.patch b/py2-oamap-Const2Literal.patch deleted file mode 100644 index b09eab3a424..00000000000 --- a/py2-oamap-Const2Literal.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/oamap/compiler.py b/oamap/compiler.py -index f45e42a..04073b4 100644 ---- a/oamap/compiler.py -+++ b/oamap/compiler.py -@@ -294,7 +294,7 @@ else: - else: - raise IndexError("item {0} out of range for type {1}".format(idx, tpe.schema)) - -- @numba.extending.lower_builtin("static_getitem", SchemaType, numba.types.Const) -+ @numba.extending.lower_builtin("static_getitem", SchemaType, numba.types.Literal) - def schema_static_getitem(context, builder, sig, args): - typ, _ = sig.args - return numba.cgutils.create_struct_proxy(typ)(context, builder)._getvalue() -@@ -1415,7 +1415,7 @@ else: - else: - raise IndexError("item {0} out of range for type {1}".format(idx, tpe.generator.schema)) - -- @numba.extending.lower_builtin("static_getitem", TupleProxyNumbaType, numba.types.Const) -+ @numba.extending.lower_builtin("static_getitem", TupleProxyNumbaType, numba.types.Literal) - def tupleproxy_static_getitem(context, builder, sig, args): - tupletpe, _ = sig.args - tupleval, idx = args diff --git a/python_tools.spec b/python_tools.spec index 0cf43c2e854..14f686c6a90 100644 --- a/python_tools.spec +++ b/python_tools.spec @@ -35,7 +35,6 @@ Requires: py2-h5py Requires: py2-h5py-cache Requires: py2-root_pandas Requires: py2-uproot -Requires: py2-oamap #this DOES NOT depend on numpy.. Requires: py2-xrootdpyfs