Merge pull request #7019 from davidlange6/dl210611

cleaning up unused py2 tools ; restoring tensorflow as part of python_tools.spec
cms-sw · Jun 15, 2021 · 098a5ab · 098a5ab
2 parents c140b62 + 07e8776
commit 098a5ab
Show file tree

Hide file tree

Showing 16 changed files with 20 additions and 31 deletions.
diff --git a/pip/absl-py.file b/pip/absl-py.file
@@ -1 +1 @@
-Requires: py2-enum34 py2-six
+Requires: py2-six
diff --git a/pip/argon2-cffi.file b/pip/argon2-cffi.file
@@ -1 +1 @@
-Requires: py3-cffi py2-six py2-enum34 py2-wheel
+Requires: py3-cffi py2-six py2-wheel
diff --git a/pip/astroid.file b/pip/astroid.file
@@ -1,2 +1,2 @@
-Requires: py3-lazy-object-proxy py2-six py3-wrapt py2-enum34 py3-singledispatch py2-backports-functools_lru_cache
+Requires: py3-lazy-object-proxy py2-six py3-wrapt py3-singledispatch py2-backports-functools_lru_cache
 Requires: py3-pytest-runner
diff --git a/pip/fire.file b/pip/fire.file
@@ -1 +1 @@
-Requires: py2-six py3-termcolor py2-enum34
+Requires: py2-six py3-termcolor
diff --git a/pip/flake8.file b/pip/flake8.file
@@ -1,2 +1,2 @@
-Requires: py2-backports py2-enum34 py3-mccabe py3-pycodestyle py3-pyflakes py3-entrypoints py3-typing py3-importlib-metadata
+Requires: py2-backports py3-mccabe py3-pycodestyle py3-pyflakes py3-entrypoints py3-typing py3-importlib-metadata
 %define RelocatePython %{i}/bin/*
diff --git a/pip/fs.file b/pip/fs.file
@@ -1,2 +1,2 @@
-Requires: py2-six py3-typing py3-appdirs py3-pytz py2-backports py2-enum34
+Requires: py2-six py3-typing py3-appdirs py3-pytz py2-backports
 %define RelocatePython %{i}/bin/*
diff --git a/pip/grpcio.file b/pip/grpcio.file
@@ -1 +1 @@
-Requires: py2-enum34 py2-futures py2-six
+Requires: py2-six
diff --git a/pip/isort.file b/pip/isort.file
@@ -1,4 +1,4 @@
-Requires: py2-futures py2-backports-functools_lru_cache
+Requires:  py2-backports-functools_lru_cache
 
 %define patchsrc sed -i -e '/.*futures.*/d' isort.egg-info/requires.txt setup.py
 %define RelocatePython %{i}/bin/*
diff --git a/pip/llvmlite.file b/pip/llvmlite.file
@@ -1,4 +1,4 @@
-Requires: llvm py2-wheel py2-enum34
+Requires: llvm py2-wheel 
 Patch0: py2-llvmlite-fpic-flag
 Patch1: py2-llvmlite-llvm9
 Patch2: py2-llvmlite-removeduplicate

diff --git a/pip/luigi.file b/pip/luigi.file
@@ -1,4 +1,4 @@
-Requires: py3-tornado py3-python-daemon py3-python-dateutil py2-enum34
+Requires: py3-tornado py3-python-daemon py3-python-dateutil 
 
 %define PipPostBuildPy2 (cd "%{i}/bin" && for f in *; do cp ${f} ${f}2; done)
 %define PipPostBuildPy3 (cd "%{i}/bin" && for f in *; do mv ${f} ${f}3; done)

diff --git a/pip/requirements.txt b/pip/requirements.txt
@@ -32,13 +32,7 @@ avro==1.10.1; python_version>'3.0'
 awkward==0.14.0; python_version>'3.0'
 awkward1==0.4.4; python_version>'3.0'
 backcall==0.2.0 ; python_version>'3.0'
-#backports_abc==0.5
 backports-functools_lru_cache==1.6.1
-backports-lzma==0.0.14
-backports-shutil_get_terminal_size==1.0.0
-backports-shutil_which==3.5.2
-backports-ssl_match_hostname==3.7.0.1
-backports-weakref==1.0.post1
 beautifulsoup4==4.9.3; python_version>'3.0'
 bleach==3.3.0; python_version>'3.0'
 bokeh==2.3.0 ; python_version>'3.0'
@@ -63,6 +57,7 @@ climate==0.4.6; python_version>'3.0'
 cloudpickle==1.3.0; python_version>'3.0'
 colorama==0.4.4; python_version>'3.0'
 conan==1.34.1 ; python_version>'3.0'
+configparser==4.0.2;python_version<'3.0'
 contextlib2==0.6.0.post1; python_version>'3.0'
 contextvars==2.4 ; python_version>'3.0'
 coverage==5.5; python_version>'3.0'
@@ -90,7 +85,6 @@ flawfinder==2.0.15; python_version>'3.0'
 fs==2.4.12; python_version>'3.0'
 funcsigs==1.0.2; python_version>'3.0'
 future==0.18.2
-futures==3.3.0;python_version<'3.0'
 gast==0.4.0; python_version>'3.0'
 gitdb==4.0.5 ; python_version>'3.0'
 GitPython==3.1.14 ; python_version>'3.0'
@@ -124,7 +118,6 @@ ipython==7.22.0 ; python_version>'3.0'
 ipywidgets==7.5.1 ; python_version>'3.0'
 isort==4.3.21; python_version>'3.0'
 jedi==0.17.2; python_version>'3.0'
-Jinja2==2.11.3; python_version<'3.0'
 Jinja2==2.11.3; python_version>'3.0'
 joblib==1.0.1 ; python_version>'3.0'
 jsonpickle==1.4.2; python_version>'3.0'
@@ -152,7 +145,6 @@ lxml==4.6.3; python_version>'3.0'
 lz4==3.1.3 ; python_version>'3.0'
 Mako==1.1.4; python_version>'3.0'
 Markdown==3.1.1; python_version>'3.0'
-MarkupSafe==1.1.1; python_version<'3.0'
 MarkupSafe==1.1.1; python_version>'3.0'
 matplotlib==3.3.4 ; python_version>'3.0'
 mccabe==0.6.1; python_version>'3.0'
@@ -229,7 +221,6 @@ pyrsistent==0.17.3 ; python_version>'3.0'
 py==1.10.0; python_version>'3.0'
 pydantic==1.8.2 ; python_version>'3.0'
 pylev==1.3.0 ; python_version>'3.0'
-pysqlite==2.8.3; python_version<'3.0'
 pysqlite3==0.4.6; python_version>'3.0'
 pytest==6.2.2 ; python_version>'3.0'
 pytest-cov==2.11.1; python_version>'3.0'

diff --git a/pip/tensorboard.file b/pip/tensorboard.file
@@ -1,2 +1,2 @@
-Requires: py3-Markdown py2-futures py3-Werkzeug py3-protobuf py3-html5lib py2-six py2-wheel py3-bleach
+Requires: py3-Markdown py3-Werkzeug py3-protobuf py3-html5lib py2-six py2-wheel py3-bleach
 %define PipDownloadSourceType none
diff --git a/pip/traitlets.file b/pip/traitlets.file
@@ -1 +1 @@
-Requires: py3-ipython_genutils py2-six py3-decorator py2-enum34
+Requires: py3-ipython_genutils py2-six py3-decorator 
diff --git a/py2-backports.spec b/py2-backports.spec
@@ -5,11 +5,7 @@ Source: none
 
 Requires: python python3
 
-BuildRequires: py2-backports-functools_lru_cache py2-backports-lzma
-BuildRequires: py2-backports-shutil_which py2-backports-ssl_match_hostname
-BuildRequires: py2-backports-shutil_get_terminal_size 
-BuildRequires: py2-backports-weakref
-
+BuildRequires: py2-backports-functools_lru_cache
 
 %prep
 

diff --git a/python_tools.spec b/python_tools.spec
@@ -5,12 +5,16 @@ Source: none
 
 Requires: root curl python python3 xrootd llvm hdf5 mxnet-predict yoda opencv
 
+#needed for cmssw until python2-> python3 switch of framework
+Requires: py2-configparser
+Requires: py2-enum34
+
 Requires: py2-scipy
 Requires: py3-Keras
 Requires: py3-Theano
 Requires: py3-scikit-learn
 #save for the end
-#Requires: py3-tensorflow
+Requires: py3-tensorflow
 Requires: py2-googlePackages
 Requires: py3-cmsml
 Requires: py3-law
@@ -92,15 +96,13 @@ Requires: py3-webencodings
 Requires: py3-widgetsnbextension
 Requires: py3-cycler
 Requires: py3-docopt
-Requires: py2-futures
 Requires: py3-networkx
 Requires: py2-prettytable
 Requires: py2-pycurl
 Requires: py3-pytz
 Requires: py3-requests
 Requires: py3-schema
 Requires: py3-python-dateutil
-Requires: py2-enum34
 Requires: py3-mock
 Requires: py3-pbr
 Requires: py3-mpmath

diff --git a/tensorflow-requires.file b/tensorflow-requires.file
@@ -1,4 +1,4 @@
-Requires: python python3 py2-numpy py2-enum34 py3-mock py2-wheel py3-typing py3-typing_extensions
+Requires: python python3 py2-numpy py3-mock py2-wheel py3-typing py3-typing_extensions
 Requires: py3-keras-applications py3-keras-preprocessing py2-setuptools py2-future py3-wrapt py3-gast py3-setuptools
 Requires: py2-cython py2-googlePackages py3-astor py2-six py3-termcolor py3-absl-py
 Requires: py2-backports py3-opt-einsum py3-flatbuffers