From 1220930fd0e4e7433bc88d4b508364553db54929 Mon Sep 17 00:00:00 2001 From: David Date: Tue, 27 Apr 2021 17:10:42 +0200 Subject: [PATCH 1/9] drop leaf packages from python2 --- pip/py3-root_pandas.file | 2 +- pip/requirements.txt | 74 +++++++++++++++++++-------------------- python_tools.spec | 75 +++++++++++++++++++--------------------- 3 files changed, 72 insertions(+), 79 deletions(-) diff --git a/pip/py3-root_pandas.file b/pip/py3-root_pandas.file index a6431f5ff29..35117061730 100644 --- a/pip/py3-root_pandas.file +++ b/pip/py3-root_pandas.file @@ -1 +1 @@ -Requires: py3-pandas py3-root_numpy +Requires: py3-pandas py2-root_numpy diff --git a/pip/requirements.txt b/pip/requirements.txt index e16b0d1e422..99c0bfc87b1 100644 --- a/pip/requirements.txt +++ b/pip/requirements.txt @@ -20,7 +20,7 @@ appdirs==1.4.4 argon2-cffi==20.1.0 argparse==1.4.0 asn1crypto==1.4.0 -astor==0.8.1 +astor==0.8.1; python_version>'3.0' astroid==1.6.6 ; python_version<'3.0' astroid==2.5.1 ; python_version>'3.0' astunparse==1.6.3 @@ -28,8 +28,8 @@ async-lru==1.0.2 ; python_version>'3.0' async-timeout==3.0.1 ; python_version>'3.0' atomicwrites==1.4.0 attrs==20.3.0 -autopep8==1.5.5 -avro==1.10.1 +autopep8==1.5.5; python_version>'3.0' +avro==1.10.1; python_version>'3.0' awkward==0.14.0 awkward1==0.4.4 backcall==0.2.0 ; python_version>'3.0' @@ -41,20 +41,20 @@ backports-shutil_which==3.5.2 backports-ssl_match_hostname==3.7.0.1 backports-weakref==1.0.post1 backports-os==0.1.1 -beautifulsoup4==4.9.3 +beautifulsoup4==4.9.3; python_version>'3.0' bleach==3.3.0 bokeh==1.4.0 ; python_version<'3.0' bokeh==2.3.0 ; python_version>'3.0' boost-histogram==0.13 ; python_version>'3.0' bottle==0.12.19 ; python_version>'3.0' -Bottleneck==1.3.2 +Bottleneck==1.3.2; python_version>'3.0' cachecontrol==0.12.6 ; python_version>'3.0' cachetools==3.1.1 ; python_version<'3.0' cachetools==4.2.1 ; python_version>'3.0' cachy==0.3.0 ; python_version>'3.0' cleo==0.8.1 ; python_version>'3.0' clikit==0.6.2 ; python_version>'3.0' -cmsml==0.1.1 +cmsml==0.1.1 ; python_version>'3.0' correctionlib==1.1.0 ; python_version>'3.0' crashtest==0.3.1 ; python_version>'3.0' certifi==2020.12.5 @@ -80,7 +80,7 @@ defusedxml==0.6.0 deprecation==2.1.0 ; python_version>'3.0' distlib==0.3.1 distro==1.5.0 ; python_version>'3.0' -docopt==0.6.2 +docopt==0.6.2 ; python_version>'3.0' docutils==0.16 downhill==0.4.0 entrypoints==0.3 @@ -90,15 +90,15 @@ filelock==3.0.12 fire==0.4.0 flit==3.1.0; python_version>'3.0' flit-core==3.1.0; python_version>'3.0' -flake8==3.8.4 +flake8==3.8.4 ; python_version>'3.0' flatbuffers==1.12.0 ; python_version>'3.0' -flawfinder==2.0.15 +flawfinder==2.0.15; python_version>'3.0' fs==2.4.12 funcsigs==1.0.2 functools32==3.2.3-2;python_version<'3.0' future==0.18.2 futures==3.3.0;python_version<'3.0' -gast==0.4.0 +gast==0.4.0; python_version>'3.0' gitdb2==2.0.6 ; python_version<'3.0' gitdb==4.0.5 ; python_version>'3.0' GitPython==2.1.15 ; python_version<'3.0' @@ -108,16 +108,15 @@ google-auth-oauthlib==0.4.2 ; python_version>'3.0' google-common==0.0.1 google-pasta==0.2.0 grpcio==1.36.0 -grpcio-tools==1.36.0 +grpcio-tools==1.36.0 ; python_version>'3.0' #1.0.1 doesn't download (wheel only?) -h5py-cache==1.0 +h5py-cache==1.0 ; python_version>'3.0' h5py==2.10.0 -hepdata-lib==0.4.1 +hepdata-lib==0.4.1 ; python_version>'3.0' hep_ml==0.6.2 hist==2.0.1 ; python_version>'3.0' -histbook==1.2.5 +histbook==1.2.5 ; python_version>'3.0' histoprint==1.6.0 ; python_version>'3.0' -histogrammar==1.0.9 ; python_version<'3.0' histogrammar==1.0.10 ; python_version>'3.0' html5lib==1.1 hyperas==0.4.1 ; python_version>'3.0' @@ -139,7 +138,7 @@ jedi==0.17.2 Jinja2==2.11.3 joblib==0.14.1 ; python_version<'3.0' joblib==1.0.1 ; python_version>'3.0' -jsonpickle==1.4.2 +jsonpickle==1.4.2; python_version>'3.0' jsonschema==3.2.0 #jupyter_client==5.3.5 ; python_version<'3.0' jupyter_client==6.1.11 ; python_version>'3.0' @@ -154,16 +153,16 @@ keras-preprocessing==1.1.2 keras2onnx==1.7.0 ; python_version>'3.0' keyring==22.3.0 ; python_version>'3.0' kiwisolver==1.1.0 -law==0.1.3 +law==0.1.3; python_version>'3.0' #can not go to 1.5.x in python2 due to astroid lazy-object-proxy==1.4.3 -lizard==1.17.7 +lizard==1.17.7; python_version>'3.0' #NO_AUTO_UPDATE: Source is defined in llvmlite.file, changing version here is not going to get new sources. Still, keep the version llvmlite==0.35.0 ; python_version>'3.0' lockfile==0.12.2 luigi==2.8.13 ; python_version<'3.0' luigi==3.0.2 ; python_version>'3.0' -lxml==4.6.2 +lxml==4.6.2; python_version>'3.0' lz4==2.2.1 ; python_version<'3.0' lz4==3.1.3 ; python_version>'3.0' Mako==1.1.4 @@ -210,7 +209,7 @@ packaging==20.9 pandas==0.24.2 ; python_version<'3.0' pandas==1.2.2 ; python_version>'3.0' pandocfilters==1.4.3 -parsimonious==0.8.1 +parsimonious==0.8.1; python_version>'3.0' parso==0.7.1 pastel==0.2.1 ; python_version>'3.0' patch-ng==1.17.4 ; python_version>'3.0' @@ -224,16 +223,16 @@ pkgconfig==1.5.2 plac==1.3.2 pluginbase==1.0.0 ; python_version>'3.0' pluggy==0.13.1 -ply==3.11 +ply==3.11; python_version>'3.0' poetry==1.1.4 ; python_version>'3.0' poetry-core==1.0.2 ; python_version>'3.0' -prettytable==1.0.1 +prettytable==1.0.1; python_version>'3.0' prometheus_client==0.9.0 prompt_toolkit==1.0.18 ; python_version<'3.0' prompt_toolkit==3.0.16 ; python_version>'3.0' protobuf==3.15.1 -prwlock==0.4.1 -psutil==5.8.0 +prwlock==0.4.1; python_version>'3.0' +psutil==5.8.0; python_version>'3.0' ptyprocess==0.7.0 pyasn1-modules==0.2.8 pyasn1==0.4.8 @@ -242,9 +241,9 @@ pybind11==2.6.2 pybrain==0.3.3 pycodestyle==2.6.0 pycparser==2.20 -pycuda==2019.1.2 +pycuda==2019.1.2; python_version>'3.0' pycurl==7.43.0.5 -pydot==1.4.2 +pydot==1.4.2; python_version>'3.0' pyflakes==2.2.0 Pygments==2.8.1 ; python_version>'3.0' PyJWT==2.0.1 ; python_version>'3.0' @@ -263,10 +262,9 @@ pytest==4.6.11 ; python_version<'3.0' pytest==6.2.2 ; python_version>'3.0' pytest-cov==2.11.1 pytest-runner==5.2 -python-cjson==1.2.2;python_version<'3.0' python-daemon==2.3.0 python-dateutil==2.8.1 -python-ldap==3.3.1 +python-ldap==3.3.1 ; python_version>'3.0' python-rapidjson==1.0;python_version>'3.0' pytoml==0.1.21;python_version>'3.0' pytools==2020.3 @@ -281,18 +279,18 @@ 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 +root_pandas==0.7.0 ; python_version>'3.0' +rootpy==1.0.1; python_version>'3.0' rsa==4.7.2 ; python_version>'3.0' scandir==1.10.0 -schema==0.7.4 +schema==0.7.4; python_version>'3.0' scikit-learn==0.20.4 ; python_version<'3.0' scikit-learn==0.24.1 ; python_version>'3.0' scinum==1.1.3 scipy==1.2.3 ; python_version<'3.0' scipy==1.6.1 ; python_version>'3.0' threadpoolctl==2.0.0 ; python_version> '3.0' -seaborn==0.9.1 +seaborn==0.9.1; python_version>'3.0' Send2Trash==1.5.0 setuptools-scm==3.5.0 shellingham==1.4.0 ; python_version> '3.0' @@ -307,9 +305,7 @@ soupsieve==1.9.6 sqlalchemy==1.3.11 stevedore==1.32.0 subprocess32==3.5.4 -sympy==1.5.1 ; python_version<'3.0' sympy==1.7.1 ; python_version>'3.0' -tables==3.5.2 ; python_version<'3.0' tables==3.6.1 ; python_version>'3.0' #NO_AUTO_UPDATE:2: Force to use tensorflow 2.4.1; this should match the version in tensorflow-sources.spec tensorboard==2.4.1 ; python_version>'3.0' @@ -332,14 +328,14 @@ traitlets==4.3.3 typed-ast==1.4.2 ; python_version>'3.0' typing_extensions==3.7.4.3 typing==3.7.4.3 -uncertainties==3.1.5 -uproot==3.13.0 +uncertainties==3.1.5; python_version>'3.0' +uproot==3.13.0; python_version>'3.0' uproot-methods==0.8.0 -uproot4==0.1.2 +uproot4==0.1.2; python_version>'3.0' urllib3==1.26.3 virtualenv-clone==0.5.4 virtualenv==20.4.2 -virtualenvwrapper==4.8.4 +virtualenvwrapper==4.8.4; python_version>'3.0' wcwidth==0.2.5 webencodings==0.5.1 Werkzeug==1.0.1 @@ -350,7 +346,7 @@ wrapt==1.11.2 xgboost==0.82 ; python_version<'3.0' xgboost==1.3.3 ; python_version>'3.0' #bumping this pulls in xrootd - which looks like it needs some understanding -xrootdpyfs==0.2.1 +xrootdpyfs==0.2.1; python_version>'3.0' yarl==1.6.3 ;python_version>'3.0' zipp==1.2.0 ; python_version<'3.0' zipp==3.4.0 ; python_version>'3.0' diff --git a/python_tools.spec b/python_tools.spec index c2f4f79866a..66faa37224b 100644 --- a/python_tools.spec +++ b/python_tools.spec @@ -10,19 +10,18 @@ Requires: py2-Keras Requires: py2-Theano Requires: py2-scikit-learn #save for the end -Requires: py3-tensorflow +#Requires: py3-tensorflow Requires: py2-googlePackages -Requires: py2-cmsml -Requires: py2-law +Requires: py3-cmsml +Requires: py3-law Requires: py2-cloudpickle -Requires: py2-tables Requires: py3-tables Requires: py2-numexpr -Requires: py2-histogrammar py3-histogrammar +Requires: py3-histogrammar Requires: py2-pandas Requires: py2-root_numpy -Requires: py2-Bottleneck +Requires: py3-Bottleneck Requires: py2-downhill Requires: py2-theanets Requires: py2-xgboost py3-xgboost @@ -30,25 +29,25 @@ Requires: py3-llvmlite Requires: py3-numba Requires: py2-hep_ml Requires: py3-rep -Requires: py2-uncertainties +Requires: py3-uncertainties Requires: py3-hyperas Requires: py2-hyperopt -Requires: py2-seaborn +Requires: py3-seaborn Requires: py2-h5py -Requires: py2-h5py-cache -Requires: py2-root_pandas -Requires: py2-uproot -Requires: py2-uproot4 +Requires: py3-h5py-cache +Requires: py3-root_pandas +Requires: py3-uproot +Requires: py3-uproot4 Requires: py2-opt-einsum Requires: py2-joblib py3-joblib #this DOES NOT depend on numpy.. -Requires: py2-xrootdpyfs +Requires: py3-xrootdpyfs Requires: root curl python openldap Requires: py2-entrypoints -Requires: py2-psutil +Requires: py3-psutil Requires: py2-repoze-lru Requires: py2-Jinja2 Requires: py2-MarkupSafe @@ -98,44 +97,43 @@ Requires: py2-wcwidth Requires: py2-webencodings Requires: py3-widgetsnbextension Requires: py2-cycler -Requires: py2-docopt +Requires: py3-docopt Requires: py2-futures Requires: py2-networkx -Requires: py2-parsimonious -Requires: py2-prettytable +Requires: py3-parsimonious +Requires: py3-prettytable Requires: py2-pycurl Requires: py2-pytz Requires: py2-requests -Requires: py2-schema +Requires: py3-schema #Requires: py2-Jinja Requires: py2-python-dateutil -Requires: py2-python-cjson Requires: py2-enum34 Requires: py2-functools32 Requires: py2-mock Requires: py2-pbr Requires: py2-mpmath -Requires: py2-sympy py3-sympy +Requires: py3-sympy Requires: py2-tqdm Requires: py2-funcsigs Requires: py2-nose Requires: py2-pkgconfig Requires: py2-pysqlite Requires: py2-Click -Requires: py2-jsonpickle -Requires: py2-prwlock +Requires: py3-jsonpickle +Requires: py3-prwlock Requires: py2-virtualenv -Requires: py2-virtualenvwrapper +Requires: py3-virtualenvwrapper Requires: py2-urllib3 Requires: py2-chardet Requires: py2-idna Requires: py2-Werkzeug Requires: py2-pytest -Requires: py2-avro +Requires: py3-avro Requires: py2-fs -Requires: py2-lizard -Requires: py2-flawfinder -Requires: py2-python-ldap +Requires: py3-lizard +Requires: py3-flawfinder +Requires: py3-python-ldap Requires: py2-plac Requires: py2-matplotlib @@ -153,12 +151,12 @@ Requires: py2-cx-Oracle Requires: py2-cython Requires: py2-future Requires: py2-pybind11-toolfile -Requires: py2-histbook -Requires: py2-flake8 -Requires: py2-autopep8 +Requires: py3-histbook +Requires: py3-flake8 +Requires: py3-autopep8 Requires: py2-pycodestyle Requires: py2-lz4 -Requires: py2-ply +Requires: py3-ply Requires: py2-py Requires: py2-typing Requires: py2-defusedxml @@ -170,8 +168,8 @@ Requires: py3-onnxmltools Requires: py2-backports Requires: py2-backports_abc Requires: py2-colorama -Requires: py2-lxml -Requires: py2-beautifulsoup4 +Requires: py3-lxml +Requires: py3-beautifulsoup4 Requires: py2-GitPython py3-GitPython Requires: py2-Send2Trash Requires: py2-gitdb2 @@ -183,7 +181,6 @@ Requires: py2-prometheus_client Requires: py2-pyasn1-modules Requires: py2-pyasn1 Requires: py2-pyflakes -Requires: py2-python-ldap Requires: py2-smmap2 Requires: py2-stevedore Requires: py2-typing_extensions @@ -197,9 +194,9 @@ Requires: py2-jedi Requires: py2-parso Requires: py2-pycparser Requires: py2-absl-py -Requires: py2-gast +Requires: py3-gast Requires: py2-grpcio -Requires: py2-grpcio-tools +Requires: py3-grpcio-tools Requires: py2-Markdown Requires: py2-subprocess32 Requires: py2-kiwisolver @@ -212,11 +209,11 @@ Requires: py2-nose-parameterized Requires: py2-pillow Requires: py2-pybrain Requires: py2-pymongo -Requires: py2-pydot +Requires: py3-pydot Requires: py2-astroid Requires: py2-coverage -Requires: py2-hepdata-lib +Requires: py3-hepdata-lib Requires: py2-isort Requires: py2-lazy-object-proxy Requires: py2-pylint @@ -230,7 +227,7 @@ Requires: py2-importlib-resources Requires: py2-smmap Requires: py2-zipp py3-zipp -Requires: py2-pycuda +Requires: py3-pycuda Requires: onnxruntime Requires: py3-boost-histogram From a37705c9a06cc61132abd66b28676d7c0407f027 Mon Sep 17 00:00:00 2001 From: David Date: Tue, 27 Apr 2021 18:01:39 +0200 Subject: [PATCH 2/9] a few more packages --- pip/law.file | 2 +- pip/requirements.txt | 6 +++--- pip/uproot.file | 2 +- pip/uproot4.file | 2 +- pip/virtualenvwrapper.file | 2 +- python_tools.spec | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pip/law.file b/pip/law.file index 8d82d495e94..801dba53a57 100644 --- a/pip/law.file +++ b/pip/law.file @@ -1,3 +1,3 @@ -Requires: py2-six py2-luigi py3-luigi py2-scinum +Requires: py2-six py2-luigi py3-luigi py3-scinum %define RelocatePython %{i}/bin/* diff --git a/pip/requirements.txt b/pip/requirements.txt index 99c0bfc87b1..e25c4df3962 100644 --- a/pip/requirements.txt +++ b/pip/requirements.txt @@ -286,7 +286,7 @@ scandir==1.10.0 schema==0.7.4; python_version>'3.0' scikit-learn==0.20.4 ; python_version<'3.0' scikit-learn==0.24.1 ; python_version>'3.0' -scinum==1.1.3 +scinum==1.1.3; python_version>'3.0' scipy==1.2.3 ; python_version<'3.0' scipy==1.6.1 ; python_version>'3.0' threadpoolctl==2.0.0 ; python_version> '3.0' @@ -330,10 +330,10 @@ typing_extensions==3.7.4.3 typing==3.7.4.3 uncertainties==3.1.5; python_version>'3.0' uproot==3.13.0; python_version>'3.0' -uproot-methods==0.8.0 +uproot-methods==0.8.0; python_version>'3.0' uproot4==0.1.2; python_version>'3.0' urllib3==1.26.3 -virtualenv-clone==0.5.4 +virtualenv-clone==0.5.4; python_version>'3.0' virtualenv==20.4.2 virtualenvwrapper==4.8.4; python_version>'3.0' wcwidth==0.2.5 diff --git a/pip/uproot.file b/pip/uproot.file index 8af81184cc5..1eccaff603a 100644 --- a/pip/uproot.file +++ b/pip/uproot.file @@ -1,2 +1,2 @@ -Requires: py2-numpy py2-awkward py2-uproot-methods py2-cachetools +Requires: py2-numpy py2-awkward py3-uproot-methods py2-cachetools Requires: py3-cachetools diff --git a/pip/uproot4.file b/pip/uproot4.file index 9449442eb62..dc071c06061 100644 --- a/pip/uproot4.file +++ b/pip/uproot4.file @@ -1,2 +1,2 @@ -Requires: py2-numpy py2-awkward1 py2-uproot-methods py2-cachetools +Requires: py2-numpy py2-awkward1 py3-uproot-methods py2-cachetools Requires: py3-cachetools diff --git a/pip/virtualenvwrapper.file b/pip/virtualenvwrapper.file index 584a053e8be..a666df99721 100644 --- a/pip/virtualenvwrapper.file +++ b/pip/virtualenvwrapper.file @@ -1 +1 @@ -Requires: py2-stevedore py2-virtualenv py2-virtualenv-clone +Requires: py2-stevedore py2-virtualenv py3-virtualenv-clone diff --git a/python_tools.spec b/python_tools.spec index 66faa37224b..fa32bfa54e5 100644 --- a/python_tools.spec +++ b/python_tools.spec @@ -10,7 +10,7 @@ Requires: py2-Keras Requires: py2-Theano Requires: py2-scikit-learn #save for the end -#Requires: py3-tensorflow +Requires: py3-tensorflow Requires: py2-googlePackages Requires: py3-cmsml Requires: py3-law @@ -184,7 +184,7 @@ Requires: py2-pyflakes Requires: py2-smmap2 Requires: py2-stevedore Requires: py2-typing_extensions -Requires: py2-virtualenv-clone +Requires: py3-virtualenv-clone Requires: py2-asn1crypto Requires: py3-backcall Requires: py2-cffi From 66bc785cd78d856176c1602dda38602ef0938cff Mon Sep 17 00:00:00 2001 From: David Date: Tue, 27 Apr 2021 18:07:06 +0200 Subject: [PATCH 3/9] a few more packages removed --- pip/rep.file | 2 +- pip/requirements.txt | 6 +++--- pip/tensorflow.file | 2 +- pip/virtualenvwrapper.file | 2 +- python_tools.spec | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pip/rep.file b/pip/rep.file index 3980012fc36..b3eb6ee6e93 100644 --- a/pip/rep.file +++ b/pip/rep.file @@ -1,2 +1,2 @@ -Requires: py2-hep_ml py2-matplotlib py2-theanets py2-nose py2-nose-parameterized py2-bokeh py2-mpld3 py2-neurolab py2-pybrain py2-xgboost +Requires: py2-hep_ml py2-matplotlib py3-theanets py2-nose py2-nose-parameterized py2-bokeh py2-mpld3 py2-neurolab py2-pybrain py2-xgboost Requires: py3-notebook py3-xgboost py3-matplotlib py3-bokeh diff --git a/pip/requirements.txt b/pip/requirements.txt index e25c4df3962..4aff9c13b57 100644 --- a/pip/requirements.txt +++ b/pip/requirements.txt @@ -23,7 +23,7 @@ asn1crypto==1.4.0 astor==0.8.1; python_version>'3.0' astroid==1.6.6 ; python_version<'3.0' astroid==2.5.1 ; python_version>'3.0' -astunparse==1.6.3 +astunparse==1.6.3; python_version>'3.0' async-lru==1.0.2 ; python_version>'3.0' async-timeout==3.0.1 ; python_version>'3.0' atomicwrites==1.4.0 @@ -303,7 +303,7 @@ smmap2==3.0.1 soupsieve==1.9.6 #to update the patch needs to be fixed... sqlalchemy==1.3.11 -stevedore==1.32.0 +stevedore==1.32.0; python_version>'3.0' subprocess32==3.5.4 sympy==1.7.1 ; python_version>'3.0' tables==3.6.1 ; python_version>'3.0' @@ -316,7 +316,7 @@ termcolor==1.1.0 terminado==0.8.3 testpath==0.4.4 ; python_version<'3.0' testpath==0.4.4 ; python_version>'3.0' -theanets==0.7.3 +theanets==0.7.3; python_version>'3.0' Theano==1.0.5 toml==0.10.2 tomlkit==0.7.0 ; python_version>'3.0' diff --git a/pip/tensorflow.file b/pip/tensorflow.file index e960630a29a..22cd7b9bb34 100644 --- a/pip/tensorflow.file +++ b/pip/tensorflow.file @@ -1,5 +1,5 @@ ## INCLUDE tensorflow-requires Requires: py2-funcsigs py2-pbr py2-packaging py2-appdirs py2-pyparsing py2-mock py2-Werkzeug -Requires: py2-grpcio py2-astunparse +Requires: py2-grpcio py3-astunparse %define source0 none %define source_file none diff --git a/pip/virtualenvwrapper.file b/pip/virtualenvwrapper.file index a666df99721..652de65b43a 100644 --- a/pip/virtualenvwrapper.file +++ b/pip/virtualenvwrapper.file @@ -1 +1 @@ -Requires: py2-stevedore py2-virtualenv py3-virtualenv-clone +Requires: py3-stevedore py2-virtualenv py3-virtualenv-clone diff --git a/python_tools.spec b/python_tools.spec index fa32bfa54e5..5fb9ac17b76 100644 --- a/python_tools.spec +++ b/python_tools.spec @@ -23,7 +23,7 @@ Requires: py2-pandas Requires: py2-root_numpy Requires: py3-Bottleneck Requires: py2-downhill -Requires: py2-theanets +Requires: py3-theanets Requires: py2-xgboost py3-xgboost Requires: py3-llvmlite Requires: py3-numba @@ -182,7 +182,7 @@ Requires: py2-pyasn1-modules Requires: py2-pyasn1 Requires: py2-pyflakes Requires: py2-smmap2 -Requires: py2-stevedore +Requires: py3-stevedore Requires: py2-typing_extensions Requires: py3-virtualenv-clone Requires: py2-asn1crypto From 5acc87ea23dcce48f424a64c1c312592b41d7258 Mon Sep 17 00:00:00 2001 From: David Date: Tue, 27 Apr 2021 18:38:38 +0200 Subject: [PATCH 4/9] removing more python2 --- pip/law.file | 2 +- pip/luigi.file | 2 +- pip/poetry.file | 2 +- pip/python-daemon.file | 2 +- pip/requirements.txt | 7 +++---- pip/virtualenvwrapper.file | 2 +- python_tools.spec | 2 +- 7 files changed, 9 insertions(+), 10 deletions(-) diff --git a/pip/law.file b/pip/law.file index 801dba53a57..153f8c2f797 100644 --- a/pip/law.file +++ b/pip/law.file @@ -1,3 +1,3 @@ -Requires: py2-six py2-luigi py3-luigi py3-scinum +Requires: py2-six py3-luigi py3-scinum %define RelocatePython %{i}/bin/* diff --git a/pip/luigi.file b/pip/luigi.file index 23d3f71b3ef..296fa17b59b 100644 --- a/pip/luigi.file +++ b/pip/luigi.file @@ -1,4 +1,4 @@ -Requires: py2-tornado py3-tornado py2-python-daemon py2-python-dateutil py2-enum34 +Requires: py2-tornado py3-tornado py3-python-daemon py2-python-dateutil py2-enum34 %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/poetry.file b/pip/poetry.file index 49d4c9a89f7..9106ca37ab8 100644 --- a/pip/poetry.file +++ b/pip/poetry.file @@ -1,2 +1,2 @@ -Requires: py3-cachecontrol py3-cachy py3-cleo py2-html5lib py3-keyring py2-pexpect py3-pkginfo py2-virtualenv +Requires: py3-cachecontrol py3-cachy py3-cleo py2-html5lib py3-keyring py2-pexpect py3-pkginfo py3-virtualenv Requires: py3-requests-toolbelt py3-shellingham py3-tomlkit diff --git a/pip/python-daemon.file b/pip/python-daemon.file index 05506c5a36b..a6bca70fc99 100644 --- a/pip/python-daemon.file +++ b/pip/python-daemon.file @@ -1 +1 @@ -Requires: py2-wheel py2-docutils py2-lockfile +Requires: py2-wheel py2-docutils py3-lockfile diff --git a/pip/requirements.txt b/pip/requirements.txt index 4aff9c13b57..ae6d329ba15 100644 --- a/pip/requirements.txt +++ b/pip/requirements.txt @@ -159,8 +159,7 @@ lazy-object-proxy==1.4.3 lizard==1.17.7; python_version>'3.0' #NO_AUTO_UPDATE: Source is defined in llvmlite.file, changing version here is not going to get new sources. Still, keep the version llvmlite==0.35.0 ; python_version>'3.0' -lockfile==0.12.2 -luigi==2.8.13 ; python_version<'3.0' +lockfile==0.12.2; python_version>'3.0' luigi==3.0.2 ; python_version>'3.0' lxml==4.6.2; python_version>'3.0' lz4==2.2.1 ; python_version<'3.0' @@ -262,7 +261,7 @@ pytest==4.6.11 ; python_version<'3.0' pytest==6.2.2 ; python_version>'3.0' pytest-cov==2.11.1 pytest-runner==5.2 -python-daemon==2.3.0 +python-daemon==2.3.0; python_version>'3.0' python-dateutil==2.8.1 python-ldap==3.3.1 ; python_version>'3.0' python-rapidjson==1.0;python_version>'3.0' @@ -334,7 +333,7 @@ uproot-methods==0.8.0; python_version>'3.0' uproot4==0.1.2; python_version>'3.0' urllib3==1.26.3 virtualenv-clone==0.5.4; python_version>'3.0' -virtualenv==20.4.2 +virtualenv==20.4.2; python_version>'3.0' virtualenvwrapper==4.8.4; python_version>'3.0' wcwidth==0.2.5 webencodings==0.5.1 diff --git a/pip/virtualenvwrapper.file b/pip/virtualenvwrapper.file index 652de65b43a..9b5c5bb3ff1 100644 --- a/pip/virtualenvwrapper.file +++ b/pip/virtualenvwrapper.file @@ -1 +1 @@ -Requires: py3-stevedore py2-virtualenv py3-virtualenv-clone +Requires: py3-stevedore py3-virtualenv py3-virtualenv-clone diff --git a/python_tools.spec b/python_tools.spec index 5fb9ac17b76..edf87b53e8d 100644 --- a/python_tools.spec +++ b/python_tools.spec @@ -122,7 +122,7 @@ Requires: py2-pysqlite Requires: py2-Click Requires: py3-jsonpickle Requires: py3-prwlock -Requires: py2-virtualenv +Requires: py3-virtualenv Requires: py3-virtualenvwrapper Requires: py2-urllib3 Requires: py2-chardet From 08ac99658742d7f7faa30bb10386ce39ab3a11f0 Mon Sep 17 00:00:00 2001 From: David Date: Tue, 27 Apr 2021 18:51:42 +0200 Subject: [PATCH 5/9] matplotlib --- pip/mpld3.file | 2 +- pip/pycuda.file | 2 +- pip/rep.file | 2 +- pip/rootpy.file | 2 +- pip/seaborn.file | 2 +- python_tools.spec | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pip/mpld3.file b/pip/mpld3.file index d32b14ff4f0..ee30db786ec 100644 --- a/pip/mpld3.file +++ b/pip/mpld3.file @@ -1 +1 @@ -Requires: py2-Jinja2 py2-matplotlib py3-matplotlib +Requires: py2-Jinja2 py3-matplotlib diff --git a/pip/pycuda.file b/pip/pycuda.file index 58a7f004361..3b7b2e4322f 100644 --- a/pip/pycuda.file +++ b/pip/pycuda.file @@ -1 +1 @@ -Requires: py2-numpy py3-numpy cuda py2-pytools py2-pytest py2-decorator py2-appdirs py2-Mako +Requires: py2-numpy py3-numpy cuda py2-pytools py2-pytest py2-decorator py2-appdirs py3-Mako diff --git a/pip/rep.file b/pip/rep.file index b3eb6ee6e93..a3bd0f2444f 100644 --- a/pip/rep.file +++ b/pip/rep.file @@ -1,2 +1,2 @@ -Requires: py2-hep_ml py2-matplotlib py3-theanets py2-nose py2-nose-parameterized py2-bokeh py2-mpld3 py2-neurolab py2-pybrain py2-xgboost +Requires: py2-hep_ml py3-theanets py2-nose py2-nose-parameterized py2-bokeh py3-mpld3 py2-neurolab py2-pybrain py2-xgboost Requires: py3-notebook py3-xgboost py3-matplotlib py3-bokeh diff --git a/pip/rootpy.file b/pip/rootpy.file index 2961afe2913..1df6932aa69 100644 --- a/pip/rootpy.file +++ b/pip/rootpy.file @@ -1,2 +1,2 @@ -Requires: root py2-matplotlib +Requires: root py3-matplotlib %define PipPostBuild perl -p -i -e "s|^#!.*python.*|#!/usr/bin/env python|" %{i}/bin/* diff --git a/pip/seaborn.file b/pip/seaborn.file index acba3ea2e74..da2850fc6b9 100644 --- a/pip/seaborn.file +++ b/pip/seaborn.file @@ -1 +1 @@ -Requires: py2-matplotlib py3-matplotlib py2-scipy py2-pandas py3-scipy py3-pandas +Requires: py3-matplotlib py2-scipy py2-pandas py3-scipy py3-pandas diff --git a/python_tools.spec b/python_tools.spec index edf87b53e8d..da15e2122a5 100644 --- a/python_tools.spec +++ b/python_tools.spec @@ -136,7 +136,7 @@ Requires: py3-flawfinder Requires: py3-python-ldap Requires: py2-plac -Requires: py2-matplotlib +Requires: py3-matplotlib Requires: py2-numpy-toolfile Requires: py2-sqlalchemy Requires: py2-pygithub @@ -203,7 +203,7 @@ Requires: py2-kiwisolver Requires: py2-pyOpenSSL Requires: py2-bokeh py3-bokeh Requires: py2-climate -Requires: py2-mpld3 +Requires: py3-mpld3 Requires: py2-neurolab Requires: py2-nose-parameterized Requires: py2-pillow From f177579fab44d0dfd18f2d297fb13b5424ec4313 Mon Sep 17 00:00:00 2001 From: David Date: Tue, 27 Apr 2021 19:09:02 +0200 Subject: [PATCH 6/9] more migrations away from python2 --- pip/downhill.file | 2 +- pip/histoprint.file | 2 +- pip/py3-root_pandas.file | 2 +- pip/requirements.txt | 17 ++++++++--------- pip/root_pandas.file | 2 +- pip/sympy.file | 2 +- pip/theanets.file | 2 +- python_tools.spec | 10 +++++----- tensorflow-requires.file | 2 +- 9 files changed, 20 insertions(+), 21 deletions(-) diff --git a/pip/downhill.file b/pip/downhill.file index 431aeed6ed3..da794bc8330 100644 --- a/pip/downhill.file +++ b/pip/downhill.file @@ -1 +1 @@ -Requires: py2-Theano py2-Click +Requires: py2-Theano py3-Click diff --git a/pip/histoprint.file b/pip/histoprint.file index 8571bc51d2e..bd1592b9d15 100644 --- a/pip/histoprint.file +++ b/pip/histoprint.file @@ -1 +1 @@ -Requires: py3-numpy py2-setuptools-scm py2-toml py2-Click +Requires: py3-numpy py2-setuptools-scm py2-toml py3-Click diff --git a/pip/py3-root_pandas.file b/pip/py3-root_pandas.file index 35117061730..a6431f5ff29 100644 --- a/pip/py3-root_pandas.file +++ b/pip/py3-root_pandas.file @@ -1 +1 @@ -Requires: py3-pandas py2-root_numpy +Requires: py3-pandas py3-root_numpy diff --git a/pip/requirements.txt b/pip/requirements.txt index ae6d329ba15..d3165072715 100644 --- a/pip/requirements.txt +++ b/pip/requirements.txt @@ -60,10 +60,10 @@ crashtest==0.3.1 ; python_version>'3.0' certifi==2020.12.5 cffi==1.14.5 chardet==3.0.4 -Click==7.1.2 +Click==7.1.2; python_version>'3.0' #NO_AUTO_UPDATE: Source is defined in climate.file, changing version here is not going to get new sources #Looks like package version in PyPi is very old -climate==0.4.6 +climate==0.4.6; python_version>'3.0' cloudpickle==1.3.0 colorama==0.4.4 conan==1.34.1 ; python_version>'3.0' @@ -82,7 +82,7 @@ distlib==0.3.1 distro==1.5.0 ; python_version>'3.0' docopt==0.6.2 ; python_version>'3.0' docutils==0.16 -downhill==0.4.0 +downhill==0.4.0; python_version>'3.0' entrypoints==0.3 enum34==1.1.10;python_version<'3.0' fasteners==0.16 ; python_version>'3.0' @@ -108,7 +108,7 @@ google-auth-oauthlib==0.4.2 ; python_version>'3.0' google-common==0.0.1 google-pasta==0.2.0 grpcio==1.36.0 -grpcio-tools==1.36.0 ; python_version>'3.0' +grpcio-tools==1.36.0 #1.0.1 doesn't download (wheel only?) h5py-cache==1.0 ; python_version>'3.0' h5py==2.10.0 @@ -164,19 +164,18 @@ luigi==3.0.2 ; python_version>'3.0' lxml==4.6.2; python_version>'3.0' lz4==2.2.1 ; python_version<'3.0' lz4==3.1.3 ; python_version>'3.0' -Mako==1.1.4 +Mako==1.1.4; python_version>'3.0' Markdown==3.1.1 MarkupSafe==1.1.1 -matplotlib==2.2.5 ; python_version<'3.0' matplotlib==3.3.4 ; python_version>'3.0' mccabe==0.6.1 mistune==0.8.4 mock==3.0.5 more-itertools==5.0.0 ; python_version<'3.0' more-itertools==8.7.0 ; python_version>'3.0' -mpld3==0.5.2 +mpld3==0.5.2; python_version>'3.0' mplhep==0.2.16 ; python_version>'3.0' -mpmath==1.2.1 +mpmath==1.2.1; python_version>'3.0' multidict==5.1.0 ; python_version>'3.0' nbconvert==5.6.1; python_version>'3.0' nbdime==1.1.0 ; python_version> '3.0' @@ -277,7 +276,7 @@ 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_numpy==4.8.0; python_version>'3.0' root_pandas==0.7.0 ; python_version>'3.0' rootpy==1.0.1; python_version>'3.0' rsa==4.7.2 ; python_version>'3.0' diff --git a/pip/root_pandas.file b/pip/root_pandas.file index 0bf7d2e8979..2049255c65a 100644 --- a/pip/root_pandas.file +++ b/pip/root_pandas.file @@ -1 +1 @@ -Requires: py3-pandas py2-pandas py2-root_numpy +Requires: py3-pandas py2-pandas py3-root_numpy diff --git a/pip/sympy.file b/pip/sympy.file index 08b97e91ba2..38efa967263 100644 --- a/pip/sympy.file +++ b/pip/sympy.file @@ -1,3 +1,3 @@ %define RelocatePython %{i}/bin/isympy -Requires: py2-mpmath +Requires: py3-mpmath %define PipPostBuildPy3 for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done diff --git a/pip/theanets.file b/pip/theanets.file index 8d1d800b6a0..43731560db3 100644 --- a/pip/theanets.file +++ b/pip/theanets.file @@ -1 +1 @@ -Requires: py2-Theano py2-downhill py2-climate +Requires: py2-Theano py3-downhill py3-climate diff --git a/python_tools.spec b/python_tools.spec index da15e2122a5..fc84a3abb02 100644 --- a/python_tools.spec +++ b/python_tools.spec @@ -20,9 +20,9 @@ Requires: py3-tables Requires: py2-numexpr Requires: py3-histogrammar Requires: py2-pandas -Requires: py2-root_numpy +Requires: py3-root_numpy Requires: py3-Bottleneck -Requires: py2-downhill +Requires: py3-downhill Requires: py3-theanets Requires: py2-xgboost py3-xgboost Requires: py3-llvmlite @@ -112,14 +112,14 @@ Requires: py2-enum34 Requires: py2-functools32 Requires: py2-mock Requires: py2-pbr -Requires: py2-mpmath +Requires: py3-mpmath Requires: py3-sympy Requires: py2-tqdm Requires: py2-funcsigs Requires: py2-nose Requires: py2-pkgconfig Requires: py2-pysqlite -Requires: py2-Click +Requires: py3-Click Requires: py3-jsonpickle Requires: py3-prwlock Requires: py3-virtualenv @@ -202,7 +202,7 @@ Requires: py2-subprocess32 Requires: py2-kiwisolver Requires: py2-pyOpenSSL Requires: py2-bokeh py3-bokeh -Requires: py2-climate +Requires: py3-climate Requires: py3-mpld3 Requires: py2-neurolab Requires: py2-nose-parameterized diff --git a/tensorflow-requires.file b/tensorflow-requires.file index 5e6ad7ce987..8a4dd851a65 100644 --- a/tensorflow-requires.file +++ b/tensorflow-requires.file @@ -1,5 +1,5 @@ Requires: python python3 py2-numpy py2-enum34 py2-mock py2-wheel py2-typing py2-typing_extensions -Requires: py2-keras-applications py2-keras-preprocessing py2-setuptools py2-future py2-wrapt py2-gast py3-setuptools +Requires: py2-keras-applications py2-keras-preprocessing py2-setuptools py2-future py2-wrapt py3-gast py3-setuptools Requires: py2-cython py2-googlePackages py2-functools32 py2-astor py2-six py2-termcolor py2-absl-py Requires: py2-backports py2-opt-einsum py3-opt-einsum py3-flatbuffers Requires: eigen protobuf zlib libpng libjpeg-turbo curl pcre giflib sqlite grpc flatbuffers From 15680afef58a7a8d8b35ae846f3418f72756bad5 Mon Sep 17 00:00:00 2001 From: David Date: Tue, 27 Apr 2021 19:20:58 +0200 Subject: [PATCH 7/9] cleanup dependencies I missed --- professor.spec | 2 +- professor2.spec | 2 +- python_tools.spec | 2 +- tensorflow-requires.file | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/professor.spec b/professor.spec index 518e8098a0f..7e8f47d99c9 100644 --- a/professor.spec +++ b/professor.spec @@ -2,7 +2,7 @@ ## INITENV +PATH PYTHON27PATH %i/lib/python`echo $PYTHON_VERSION | cut -d. -f 1,2`/site-packages Source: http://www.hepforge.org/archive/professor/professor-%{realversion}.tar.gz -Requires: py2-numpy py2-scipy pyminuit2 py2-matplotlib +Requires: py2-numpy py2-scipy pyminuit2 py3-matplotlib %prep %setup -n professor-%{realversion} diff --git a/professor2.spec b/professor2.spec index 19e4487174d..b42899ffc80 100644 --- a/professor2.spec +++ b/professor2.spec @@ -2,7 +2,7 @@ ## INITENV +PATH PYTHON27PATH %i/lib/python`echo $PYTHON_VERSION | cut -d. -f 1,2`/site-packages Source: http://www.hepforge.org/archive/professor/Professor-%{realversion}.tar.gz -Requires: py2-numpy py2-matplotlib root yoda eigen +Requires: py2-numpy py3-matplotlib root yoda eigen BuildRequires: py2-cython Patch0: professor2-ppc64-flag-change diff --git a/python_tools.spec b/python_tools.spec index fc84a3abb02..6f25a52958f 100644 --- a/python_tools.spec +++ b/python_tools.spec @@ -196,7 +196,7 @@ Requires: py2-pycparser Requires: py2-absl-py Requires: py3-gast Requires: py2-grpcio -Requires: py3-grpcio-tools +Requires: py2-grpcio-tools Requires: py2-Markdown Requires: py2-subprocess32 Requires: py2-kiwisolver diff --git a/tensorflow-requires.file b/tensorflow-requires.file index 8a4dd851a65..ae5f715407f 100644 --- a/tensorflow-requires.file +++ b/tensorflow-requires.file @@ -1,5 +1,5 @@ Requires: python python3 py2-numpy py2-enum34 py2-mock py2-wheel py2-typing py2-typing_extensions Requires: py2-keras-applications py2-keras-preprocessing py2-setuptools py2-future py2-wrapt py3-gast py3-setuptools -Requires: py2-cython py2-googlePackages py2-functools32 py2-astor py2-six py2-termcolor py2-absl-py +Requires: py2-cython py2-googlePackages py2-functools32 py3-astor py2-six py2-termcolor py2-absl-py Requires: py2-backports py2-opt-einsum py3-opt-einsum py3-flatbuffers Requires: eigen protobuf zlib libpng libjpeg-turbo curl pcre giflib sqlite grpc flatbuffers From 20317d500b0b8304381eda082cfdf2159463ca24 Mon Sep 17 00:00:00 2001 From: David Lange Date: Sat, 1 May 2021 16:23:43 +0200 Subject: [PATCH 8/9] Update requirements.txt add back prettytable for py2 --- pip/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip/requirements.txt b/pip/requirements.txt index d3165072715..f0172de63a3 100644 --- a/pip/requirements.txt +++ b/pip/requirements.txt @@ -224,7 +224,7 @@ pluggy==0.13.1 ply==3.11; python_version>'3.0' poetry==1.1.4 ; python_version>'3.0' poetry-core==1.0.2 ; python_version>'3.0' -prettytable==1.0.1; python_version>'3.0' +prettytable==1.0.1 prometheus_client==0.9.0 prompt_toolkit==1.0.18 ; python_version<'3.0' prompt_toolkit==3.0.16 ; python_version>'3.0' From a9b6f27a5f6077ee270bd8cb641f95ff3da5bdbd Mon Sep 17 00:00:00 2001 From: David Lange Date: Sat, 1 May 2021 16:24:32 +0200 Subject: [PATCH 9/9] Update python_tools.spec add back python2 prettytable --- python_tools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python_tools.spec b/python_tools.spec index 6f25a52958f..0a411873cfa 100644 --- a/python_tools.spec +++ b/python_tools.spec @@ -101,7 +101,7 @@ Requires: py3-docopt Requires: py2-futures Requires: py2-networkx Requires: py3-parsimonious -Requires: py3-prettytable +Requires: py2-prettytable Requires: py2-pycurl Requires: py2-pytz Requires: py2-requests