From c56dda45f2412bcd5d9c5247d6545506227162c9 Mon Sep 17 00:00:00 2001 From: Mircho Rodozov Date: Mon, 17 May 2021 08:40:40 +0200 Subject: [PATCH] Remove root_numpy for ROOT master --- pip/py2-root_pandas.file | 1 - pip/py3-root_pandas.file | 1 - pip/requirements.txt | 2 -- pip/root_numpy.file | 1 - pip/root_pandas.file | 1 - python_tools.spec | 2 -- 6 files changed, 8 deletions(-) delete mode 100644 pip/py2-root_pandas.file delete mode 100644 pip/py3-root_pandas.file delete mode 100644 pip/root_numpy.file delete mode 100644 pip/root_pandas.file diff --git a/pip/py2-root_pandas.file b/pip/py2-root_pandas.file deleted file mode 100644 index 29a2f6ce4c6..00000000000 --- a/pip/py2-root_pandas.file +++ /dev/null @@ -1 +0,0 @@ -Requires: py2-pandas py2-root_numpy diff --git a/pip/py3-root_pandas.file b/pip/py3-root_pandas.file deleted file mode 100644 index a6431f5ff29..00000000000 --- a/pip/py3-root_pandas.file +++ /dev/null @@ -1 +0,0 @@ -Requires: py3-pandas py3-root_numpy diff --git a/pip/requirements.txt b/pip/requirements.txt index 0f906290915..1b64c6ff6c1 100644 --- a/pip/requirements.txt +++ b/pip/requirements.txt @@ -281,8 +281,6 @@ rep==0.6.6 ; python_version> '3.0' requests==2.25.1 requests-toolbelt==0.9.1 ; python_version> '3.0' requests-oauthlib==1.3.0 ; python_version> '3.0' -root_numpy==4.8.0 -root_pandas==0.7.0 rootpy==1.0.1 rsa==4.7.2 ; python_version>'3.0' scandir==1.10.0 diff --git a/pip/root_numpy.file b/pip/root_numpy.file deleted file mode 100644 index a4ecd20a691..00000000000 --- a/pip/root_numpy.file +++ /dev/null @@ -1 +0,0 @@ -Requires: py2-numpy root diff --git a/pip/root_pandas.file b/pip/root_pandas.file deleted file mode 100644 index 0bf7d2e8979..00000000000 --- a/pip/root_pandas.file +++ /dev/null @@ -1 +0,0 @@ -Requires: py3-pandas py2-pandas py2-root_numpy diff --git a/python_tools.spec b/python_tools.spec index 48dc7c261e7..d3ae43784a6 100644 --- a/python_tools.spec +++ b/python_tools.spec @@ -21,7 +21,6 @@ Requires: py3-tables Requires: py2-numexpr Requires: py2-histogrammar py3-histogrammar Requires: py2-pandas -Requires: py2-root_numpy Requires: py2-Bottleneck Requires: py2-downhill Requires: py2-theanets @@ -36,7 +35,6 @@ Requires: py2-hyperopt Requires: py2-seaborn Requires: py2-h5py Requires: py2-h5py-cache -Requires: py2-root_pandas Requires: py2-uproot Requires: py2-uproot4 Requires: py2-opt-einsum