From 5aed8c3eae193e846a09feb30c8348b68a45bea7 Mon Sep 17 00:00:00 2001 From: aandvalenzuela Date: Thu, 7 Apr 2022 14:54:19 +0200 Subject: [PATCH 1/8] Update py-packages to the latest version --- pip/requirements.txt | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pip/requirements.txt b/pip/requirements.txt index 53cff7031f6..ade4d2ebef1 100644 --- a/pip/requirements.txt +++ b/pip/requirements.txt @@ -29,8 +29,8 @@ async-timeout==4.0.2 atomicwrites==1.4.0 attrs==21.2.0 autopep8==1.5.7 -avro==1.10.2 -awkward==1.5.1 +avro==1.11.0 +awkward==1.8.1 backcall==0.2.0 backports-entry-points-selectable==1.1.0 beautifulsoup4==4.10.0 @@ -84,8 +84,8 @@ flit-core==3.3.0 flake8==3.9.2 flatbuffers==2.0 flawfinder==2.0.19 -fonttools==4.26.2 -frozenlist==1.2.0 +fonttools==4.31.2 +frozenlist==1.3.0 fs==2.4.13 funcsigs==1.0.2 future==0.18.2 @@ -114,7 +114,7 @@ ipaddress==1.0.23 ipykernel==6.3.1 ipython_genutils==0.2.0 ipython==7.31.1 -ipywidgets==7.6.4 +ipywidgets==7.7.0 isort==5.9.3 jedi==0.18.0 jeepney==0.7.1 @@ -124,14 +124,14 @@ joblib==1.0.1 jsonpickle==2.0.0 jsonschema==3.2.0 jupyter-client==7.0.2 -jupyter-console==6.4.0 +jupyter-console==6.4.3 jupyter-core==4.7.1 jupyter-packaging==0.10.4 jupyterlab-pygments==0.1.2 jupyter-server==1.10.2 jupyter-server-mathjax==0.2.3 -jupyterlab-widgets==1.0.1 -keras==2.6.0 +jupyterlab-widgets==1.1.0 +keras==2.8.0 keras-applications==1.0.8 keras-preprocessing==1.1.2 keras2onnx==1.7.0 @@ -154,7 +154,7 @@ matplotlib-inline==0.1.2 mccabe==0.6.1 mistune==0.8.4 mock==4.0.3 -more-itertools==8.9.0 +more-itertools==8.12.0 mpld3==0.5.5 mplhep==0.3.12 mplhep-data==0.0.3 @@ -166,7 +166,7 @@ nbconvert==6.1.0 #nbdime==3.1.0 ; disabled not used by cmssw nbformat==5.1.3 nest-asyncio==1.5.1 -networkx==2.6.2 +networkx==2.7.1 neurolab==0.3.5 node-semver==0.8.0 notebook==6.4.3 @@ -192,16 +192,16 @@ pexpect==4.8.0 pickleshare==0.7.5 pillow==9.0.1 pkgconfig==1.5.5 -plac==1.3.3 +plac==1.3.5 platformdirs==2.3.0 pluginbase==1.0.1 pluggy==1.0.0 ply==3.11 -poetry==1.1.8 -poetry-core==1.0.4 -prettytable==2.2.0 +poetry==1.1.13 +poetry-core==1.0.8 +prettytable==3.2.0 prometheus-client==0.11.0 -prompt_toolkit==3.0.20 +prompt_toolkit==3.0.29 protobuf==3.17.3 prwlock==0.4.1 psutil==5.8.0 @@ -218,7 +218,7 @@ pydot==1.4.2 pyflakes==2.3.1 Pygments==2.10.0 PyJWT==2.1.0 -pylint==2.10.2 +pylint==2.13.4 pymongo==3.12.0 pyparsing==2.4.7 pyrsistent==0.18.0 @@ -259,7 +259,7 @@ scipy==1.7.1 secretstorage==3.3.1 semantic-version==2.8.5 threadpoolctl==2.2.0 -scons==4.2.0 +scons==4.3.0 seaborn==0.11.2 Send2Trash==1.8.0 setuptools-rust==1.1.2 @@ -281,7 +281,7 @@ tenacity==8.0.1 #NO_AUTO_UPDATE:3: Force to use tensorflow 2.6.0; this should match the version in tensorflow-sources.spec tensorboard==2.6.0 tensorflow==2.6.0 -tensorflow-estimator==2.6.0 +tensorflow-estimator==2.8.0 tensorboard-data-server==0.6.1 tensorboard-plugin-wit==1.8.0 termcolor==1.1.0 @@ -298,7 +298,7 @@ tqdm==4.62.2 traitlets==5.1.0 typed-ast==1.4.3 typing-extensions==3.10.0.2 -typing==3.7.4.3 +typing==3.10.0.0 uhi==0.3.0 uncertainties==3.1.6 uproot==4.1.5 From c5fadaee9ca79d1aa592761f15b93717f509988b Mon Sep 17 00:00:00 2001 From: aandvalenzuela Date: Thu, 7 Apr 2022 15:02:45 +0200 Subject: [PATCH 2/8] Keep tensorflow-estimator 2.6 version to match tensorflow version --- pip/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip/requirements.txt b/pip/requirements.txt index ade4d2ebef1..4f8a60b7fc8 100644 --- a/pip/requirements.txt +++ b/pip/requirements.txt @@ -281,7 +281,7 @@ tenacity==8.0.1 #NO_AUTO_UPDATE:3: Force to use tensorflow 2.6.0; this should match the version in tensorflow-sources.spec tensorboard==2.6.0 tensorflow==2.6.0 -tensorflow-estimator==2.8.0 +tensorflow-estimator==2.6.0 tensorboard-data-server==0.6.1 tensorboard-plugin-wit==1.8.0 termcolor==1.1.0 From 52751d596bfe50521d4dfa4e31ab20f687184361 Mon Sep 17 00:00:00 2001 From: aandvalenzuela Date: Fri, 8 Apr 2022 14:53:24 +0200 Subject: [PATCH 3/8] Remove typing package and its usages --- pip/boost-histogram.file | 2 +- pip/flake8.file | 2 +- pip/fs.file | 2 +- pip/importlib-resources.file | 2 +- pip/requirements.txt | 1 - pip/typing-extensions.file | 1 - pip/xrootdpyfs.file | 2 +- python_tools.spec | 1 - tensorflow-requires.file | 2 +- 9 files changed, 6 insertions(+), 9 deletions(-) delete mode 100644 pip/typing-extensions.file diff --git a/pip/boost-histogram.file b/pip/boost-histogram.file index fe5e9151f57..a8ba8bf59d7 100644 --- a/pip/boost-histogram.file +++ b/pip/boost-histogram.file @@ -1 +1 @@ -Requires: py3-numpy py3-typing +Requires: py3-numpy diff --git a/pip/flake8.file b/pip/flake8.file index f68f7272c37..0ab75089d4a 100644 --- a/pip/flake8.file +++ b/pip/flake8.file @@ -1 +1 @@ -Requires: py3-mccabe py3-pycodestyle py3-pyflakes py3-entrypoints py3-typing py3-importlib-metadata +Requires: py3-mccabe py3-pycodestyle py3-pyflakes py3-entrypoints py3-importlib-metadata diff --git a/pip/fs.file b/pip/fs.file index 9a93cf5293a..e410a39415a 100644 --- a/pip/fs.file +++ b/pip/fs.file @@ -1 +1 @@ -Requires: py3-six py3-typing py3-appdirs py3-pytz +Requires: py3-six py3-appdirs py3-pytz diff --git a/pip/importlib-resources.file b/pip/importlib-resources.file index b7f384e8c38..69938e9cf49 100644 --- a/pip/importlib-resources.file +++ b/pip/importlib-resources.file @@ -1,2 +1,2 @@ -Requires: py3-pathlib2 py3-contextlib2 py3-singledispatch py3-typing py3-importlib-metadata py3-zipp +Requires: py3-pathlib2 py3-contextlib2 py3-singledispatch py3-importlib-metadata py3-zipp diff --git a/pip/requirements.txt b/pip/requirements.txt index 4f8a60b7fc8..6d414fcfe1e 100644 --- a/pip/requirements.txt +++ b/pip/requirements.txt @@ -298,7 +298,6 @@ tqdm==4.62.2 traitlets==5.1.0 typed-ast==1.4.3 typing-extensions==3.10.0.2 -typing==3.10.0.0 uhi==0.3.0 uncertainties==3.1.6 uproot==4.1.5 diff --git a/pip/typing-extensions.file b/pip/typing-extensions.file deleted file mode 100644 index 74b564d0e64..00000000000 --- a/pip/typing-extensions.file +++ /dev/null @@ -1 +0,0 @@ -Requires: py3-typing diff --git a/pip/xrootdpyfs.file b/pip/xrootdpyfs.file index c6f66bb00c8..4b8038cd3bc 100644 --- a/pip/xrootdpyfs.file +++ b/pip/xrootdpyfs.file @@ -1 +1 @@ -Requires: xrootd py3-fs py3-typing +Requires: xrootd py3-fs diff --git a/python_tools.spec b/python_tools.spec index 21e38da8518..2d6d4e9e175 100644 --- a/python_tools.spec +++ b/python_tools.spec @@ -131,7 +131,6 @@ Requires: py3-pycodestyle Requires: py3-lz4 Requires: py3-ply Requires: py3-py -Requires: py3-typing Requires: py3-defusedxml Requires: py3-atomicwrites Requires: py3-attrs diff --git a/tensorflow-requires.file b/tensorflow-requires.file index f18aff5bf25..e51d91e6e41 100644 --- a/tensorflow-requires.file +++ b/tensorflow-requires.file @@ -1,4 +1,4 @@ -Requires: python3 py3-numpy py3-mock py3-typing py3-typing-extensions +Requires: python3 py3-numpy py3-mock py3-typing-extensions Requires: py3-keras-applications py3-keras-preprocessing py3-future py3-wrapt py3-gast py3-setuptools Requires: py3-cython py3-protobuf py3-astor py3-six py3-termcolor py3-absl-py Requires: py3-opt-einsum py3-flatbuffers From 3f3e5c7eb039130eedd224b447651c3efec1146a Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Sat, 9 Apr 2022 19:51:05 +0200 Subject: [PATCH 4/8] Update requirements.txt --- pip/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/pip/requirements.txt b/pip/requirements.txt index 6d414fcfe1e..94ff646e9b3 100644 --- a/pip/requirements.txt +++ b/pip/requirements.txt @@ -70,6 +70,7 @@ debugpy==1.5.1 defusedxml==0.7.1 deprecation==2.1.0 deprecated==1.2.13 +dill==0.3.4 distlib==0.3.2 distro==1.6.0 docopt==0.6.2 From 846a98acfcca2b44028c3fb30874620e13bddf04 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Sat, 9 Apr 2022 19:51:46 +0200 Subject: [PATCH 5/8] added py3-dill dep --- pip/pylint.file | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip/pylint.file b/pip/pylint.file index 6989fd07a69..a720917e00a 100644 --- a/pip/pylint.file +++ b/pip/pylint.file @@ -1,2 +1,2 @@ -Requires: py3-astroid py3-toml +Requires: py3-astroid py3-toml py3-dill Requires: py3-astroid py3-six py3-isort py3-mccabe From 121f67cfcfb69ba91e0564e0553e6044cee5ba55 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Sat, 9 Apr 2022 20:05:42 +0200 Subject: [PATCH 6/8] use awkward 1.8.0 --- pip/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip/requirements.txt b/pip/requirements.txt index 94ff646e9b3..7eb150d3440 100644 --- a/pip/requirements.txt +++ b/pip/requirements.txt @@ -30,7 +30,7 @@ atomicwrites==1.4.0 attrs==21.2.0 autopep8==1.5.7 avro==1.11.0 -awkward==1.8.1 +awkward==1.8.0 backcall==0.2.0 backports-entry-points-selectable==1.1.0 beautifulsoup4==4.10.0 From 9ef500c649dd8a233658a6c5decdb5dcd441a80f Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Sat, 9 Apr 2022 21:56:58 +0200 Subject: [PATCH 7/8] revert keras versions to 2.8.0. Looks like tensorflow 2.6.0 does not like keras 2.8.0 --- pip/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip/requirements.txt b/pip/requirements.txt index 7eb150d3440..e781fecfa19 100644 --- a/pip/requirements.txt +++ b/pip/requirements.txt @@ -132,7 +132,7 @@ jupyterlab-pygments==0.1.2 jupyter-server==1.10.2 jupyter-server-mathjax==0.2.3 jupyterlab-widgets==1.1.0 -keras==2.8.0 +keras==2.6.0 keras-applications==1.0.8 keras-preprocessing==1.1.2 keras2onnx==1.7.0 From 335b07ec7fed49b5a82bbd1533b8ada64050369e Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Sat, 9 Apr 2022 22:12:16 +0200 Subject: [PATCH 8/8] update pylint==2.13.5 and astroid==2.11.2 --- pip/astroid.file | 2 +- pip/requirements.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pip/astroid.file b/pip/astroid.file index 42cc361140e..15cddea8bfb 100644 --- a/pip/astroid.file +++ b/pip/astroid.file @@ -1,3 +1,3 @@ -Requires: py3-typed-ast +Requires: py3-typed-ast py3-typing-extensions Requires: py3-lazy-object-proxy py3-six py3-wrapt py3-singledispatch Requires: py3-pytest-runner diff --git a/pip/requirements.txt b/pip/requirements.txt index e781fecfa19..344a2dd8187 100644 --- a/pip/requirements.txt +++ b/pip/requirements.txt @@ -22,7 +22,7 @@ argparse==1.4.0 arrow==1.2.1 asn1crypto==1.4.0 astor==0.8.1 -astroid==2.7.3 +astroid==2.11.2 astunparse==1.6.3 async-lru==1.0.2 async-timeout==4.0.2 @@ -219,7 +219,7 @@ pydot==1.4.2 pyflakes==2.3.1 Pygments==2.10.0 PyJWT==2.1.0 -pylint==2.13.4 +pylint==2.13.5 pymongo==3.12.0 pyparsing==2.4.7 pyrsistent==0.18.0