From 6e4ecc9cc3b2eb6f96a65f22524992b9665f265f Mon Sep 17 00:00:00 2001 From: David Date: Fri, 21 Aug 2020 18:13:35 +0200 Subject: [PATCH 1/9] python3 pip package updates --- pip/ipykernel.file | 2 +- pip/matplotlib.file | 2 +- pip/nbconvert.file | 2 +- pip/notebook.file | 2 +- pip/pandas.file | 2 +- pip/requirements.txt | 33 +++++++++++++++++++-------------- 6 files changed, 24 insertions(+), 19 deletions(-) diff --git a/pip/ipykernel.file b/pip/ipykernel.file index 0bda9e28bbb..cb59e8c2863 100644 --- a/pip/ipykernel.file +++ b/pip/ipykernel.file @@ -1 +1 @@ -Requires: py2-ipython py2-jupyter_client py2-jedi py2-backcall +Requires: py2-ipython py2-jupyter_client py2-jedi py2-backcall py3-jupyter_client diff --git a/pip/matplotlib.file b/pip/matplotlib.file index 7100b396f29..ee0c7143586 100644 --- a/pip/matplotlib.file +++ b/pip/matplotlib.file @@ -1,3 +1,3 @@ -Requires: py2-cycler py2-kiwisolver py2-pyparsing py2-python-dateutil +Requires: py2-cycler py2-kiwisolver py2-pyparsing py2-python-dateutil py2-certifi py3-pillow Requires: zlib libpng freetype diff --git a/pip/nbconvert.file b/pip/nbconvert.file index 566a97c91bd..31fb009ecf1 100644 --- a/pip/nbconvert.file +++ b/pip/nbconvert.file @@ -1,2 +1,2 @@ -Requires: py2-nbformat py2-Jinja2 py2-Pygments py2-bleach py2-backports py2-defusedxml py2-entrypoints py2-mistune py2-pandocfilters py2-testpath +Requires: py2-nbformat py2-Jinja2 py2-Pygments py2-bleach py2-backports py2-defusedxml py2-entrypoints py2-mistune py2-pandocfilters py2-testpath py3-nbformat %define RelocatePython %{i}/bin/jupyter-nbconvert diff --git a/pip/notebook.file b/pip/notebook.file index 363d959a4e9..fb81d88ca46 100644 --- a/pip/notebook.file +++ b/pip/notebook.file @@ -1,2 +1,2 @@ -Requires: py2-terminado py2-nbconvert py2-ipykernel py2-Send2Trash py2-ipaddress py2-prometheus_client +Requires: py2-terminado py2-nbconvert py2-ipykernel py2-Send2Trash py2-ipaddress py2-prometheus_client py2-argon2-cffi %define PipPostBuildPy3 for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done diff --git a/pip/pandas.file b/pip/pandas.file index 8b210dde722..d1e64c39b4a 100644 --- a/pip/pandas.file +++ b/pip/pandas.file @@ -1 +1 @@ -Requires: py2-six py2-python-dateutil py2-pytz py2-numpy py3-numpy +Requires: py2-six py2-python-dateutil py2-pytz py2-numpy py3-numpy py2-cython diff --git a/pip/requirements.txt b/pip/requirements.txt index 828ce369c5a..d46f368c87c 100644 --- a/pip/requirements.txt +++ b/pip/requirements.txt @@ -16,6 +16,7 @@ absl-py==0.9.0 appdirs==1.4.4 +argon2-cffi==20.1.0 argparse==1.4.0 asn1crypto==1.4.0 astor==0.8.1 @@ -50,7 +51,8 @@ Click==7.1.2 climate==0.4.6 cloudpickle==1.3.0 colorama==0.4.3 -configparser==4.0.2 +configparser==4.0.2;python_version<'3.0' +configparser==5.0.0;python_version>'3.0' contextlib2==0.6.0.post1 coverage==5.2.1 cryptography==3.0 @@ -95,10 +97,10 @@ importlib-metadata==1.7.0 importlib-resources==1.4.0 ipaddress==1.0.23 ipykernel==4.10.1 ; python_version<'3.0' -ipykernel==5.1.3 ; python_version>'3.0' +ipykernel==5.3.4 ; python_version>'3.0' ipython_genutils==0.2.0 ipython==5.10.0 ; python_version<'3.0' -ipython==7.9.0 ; python_version>'3.0' +ipython==7.17.0 ; python_version>'3.0' ipywidgets==7.5.1 isort==4.3.21 jedi==0.17.2 @@ -106,9 +108,10 @@ Jinja2==2.11.2 joblib==0.14.1 jsonpickle==1.4.1 jsonschema==3.2.0 -jupyter_client==5.3.5 +jupyter_client==5.3.5 ; python_version<'3.0' +jupyter_client==6.1.6 ; python_version>'3.0' jupyter_console==5.2.0 ; python_version<'3.0' -jupyter_console==6.0.0 ; python_version>'3.0' +jupyter_console==6.1.0 ; python_version>'3.0' jupyter_core==4.6.3 jupyter==1.0.0 Keras==2.3.1 @@ -121,12 +124,13 @@ lizard==1.17.4 #NO_AUTO_UPDATE: Source is defined in llvmlite.file, changing version here is not going to get new sources llvmlite==0.33.0 lxml==4.5.2 -lz4==2.2.1 +lz4==2.2.1 ; python_version<'3.0' +lz4==3.1.0 ; python_version>'3.0' Mako==1.1.3 Markdown==3.1.1 MarkupSafe==1.1.1 matplotlib==2.2.5 ; python_version<'3.0' -matplotlib==3.1.1 ; python_version>'3.0' +matplotlib==3.3.1 ; python_version>'3.0' mccabe==0.6.1 mistune==0.8.4 mock==3.0.5 @@ -137,15 +141,16 @@ mpmath==1.1.0 nbconvert==5.6.1 nbdime==1.1.0 #5.0.3 does not support python2.7 even if pip thinks so -nbformat==4.4.0 +nbformat==4.4.0 ; python_version<'3.0' +nbformat==5.0.7 ; python_version>'3.0' networkx==2.2 ; python_version<'3.0' networkx==2.4 ; python_version>'3.0' neurolab==0.3.5 nose-parameterized==0.6.0 nose==1.3.7 notebook==5.7.10 ; python_version<'3.0' -notebook==6.0.2 ; python_version>'3.0' -numba==0.50.1 ; python_version>'3.0' +notebook==6.1.3 ; python_version>'3.0' +numba==0.51 ; python_version>'3.0' numexpr==2.7.1 numpy==1.16.6 ; python_version<'3.0' numpy==1.17.5 ; python_version>'3.0' @@ -159,7 +164,7 @@ opt-einsum==3.1.0 ; python_version>'3.0' ordereddict==1.1 packaging==20.4 pandas==0.24.2 ; python_version<'3.0' -pandas==0.25.3 ; python_version>'3.0' +pandas==1.1.0 ; python_version>'3.0' pandocfilters==1.4.2 parsimonious==0.8.1 parso==0.7.1 @@ -222,9 +227,9 @@ rootpy==1.0.1;python_version<'3.0' scandir==1.10.0 schema==0.7.3 scikit-learn==0.20.4 ; python_version<'3.0' -scikit-learn==0.23.0 ; python_version>'3.0' +scikit-learn==0.23.2 ; python_version>'3.0' scipy==1.2.3 ; python_version<'3.0' -scipy==1.4.1 ; python_version>'3.0' +scipy==1.5.2 ; python_version>'3.0' threadpoolctl==2.0.0 ; python_version> '3.0' seaborn==0.9.1 Send2Trash==1.5.0 @@ -255,7 +260,7 @@ theanets==0.7.3 Theano==1.0.5 toml==0.10.1 tornado==5.1.1 ; python_version<'3.0' -tornado==6.0.3 ; python_version>'3.0' +tornado==6.0.4 ; python_version>'3.0' tqdm==4.48.2 traitlets==4.3.3 typed-ast==1.4.1 ; python_version>'3.0' From a6c90e53e44e0887dcfa4dd05b40e224d2d02121 Mon Sep 17 00:00:00 2001 From: David Date: Sat, 22 Aug 2020 13:13:47 +0200 Subject: [PATCH 2/9] mixxed file --- pip/argon2-cffi.file | 1 + 1 file changed, 1 insertion(+) create mode 100644 pip/argon2-cffi.file diff --git a/pip/argon2-cffi.file b/pip/argon2-cffi.file new file mode 100644 index 00000000000..639705dad37 --- /dev/null +++ b/pip/argon2-cffi.file @@ -0,0 +1 @@ +Requires: py2-cffi py2-six py2-enum34 From 7d04c1fad0c984bc013d40922f80306b7c9820fd Mon Sep 17 00:00:00 2001 From: David Date: Mon, 24 Aug 2020 11:38:52 +0200 Subject: [PATCH 3/9] move py3 execs out of the way --- pip/jupyter_client.file | 1 + pip/nbformat.file | 1 + 2 files changed, 2 insertions(+) diff --git a/pip/jupyter_client.file b/pip/jupyter_client.file index 03c9c2c7cac..d3ed2f7c36f 100644 --- a/pip/jupyter_client.file +++ b/pip/jupyter_client.file @@ -1,3 +1,4 @@ Requires: py2-jupyter_core py2-tornado py2-python-dateutil py2-pyzmq Requires: py3-tornado %define RelocatePython %{i}/bin/* +%define PipPostBuildPy3 for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done diff --git a/pip/nbformat.file b/pip/nbformat.file index 89162524da1..3b7b9950573 100644 --- a/pip/nbformat.file +++ b/pip/nbformat.file @@ -1,2 +1,3 @@ Requires: py2-traitlets py2-jsonschema py2-jupyter_core %define RelocatePython %{i}/bin/jupyter-trust +%define PipPostBuildPy3 for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done From be24ae7ecc210e92cd64732a5955a47a948316dc Mon Sep 17 00:00:00 2001 From: David Date: Mon, 24 Aug 2020 19:10:57 +0200 Subject: [PATCH 4/9] use py3*files for py3 requirements --- pip/ipykernel.file | 2 +- pip/nbconvert.file | 2 +- pip/py3-ipykernel.file | 2 +- pip/py3-nbconvert.file | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 pip/py3-nbconvert.file diff --git a/pip/ipykernel.file b/pip/ipykernel.file index cb59e8c2863..0bda9e28bbb 100644 --- a/pip/ipykernel.file +++ b/pip/ipykernel.file @@ -1 +1 @@ -Requires: py2-ipython py2-jupyter_client py2-jedi py2-backcall py3-jupyter_client +Requires: py2-ipython py2-jupyter_client py2-jedi py2-backcall diff --git a/pip/nbconvert.file b/pip/nbconvert.file index 31fb009ecf1..566a97c91bd 100644 --- a/pip/nbconvert.file +++ b/pip/nbconvert.file @@ -1,2 +1,2 @@ -Requires: py2-nbformat py2-Jinja2 py2-Pygments py2-bleach py2-backports py2-defusedxml py2-entrypoints py2-mistune py2-pandocfilters py2-testpath py3-nbformat +Requires: py2-nbformat py2-Jinja2 py2-Pygments py2-bleach py2-backports py2-defusedxml py2-entrypoints py2-mistune py2-pandocfilters py2-testpath %define RelocatePython %{i}/bin/jupyter-nbconvert diff --git a/pip/py3-ipykernel.file b/pip/py3-ipykernel.file index 810fe231de3..63ad6ff8c50 100644 --- a/pip/py3-ipykernel.file +++ b/pip/py3-ipykernel.file @@ -1 +1 @@ -Requires: py3-ipython +Requires: py2-ipython py2-jedi py2-backcall py3-jupyter_client diff --git a/pip/py3-nbconvert.file b/pip/py3-nbconvert.file new file mode 100644 index 00000000000..cb5e702024c --- /dev/null +++ b/pip/py3-nbconvert.file @@ -0,0 +1,2 @@ +Requires: py2-Jinja2 py2-Pygments py2-bleach py2-backports py2-defusedxml py2-entrypoints py2-mistune py2-pandocfilters py2-testpath py3-nbformat +%define RelocatePython %{i}/bin/jupyter-nbconvert From a58750a2886e7e579379b161964c9d169678e68f Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Mon, 24 Aug 2020 23:02:29 +0200 Subject: [PATCH 5/9] no need to dulicate the contents of nbconvert.file which are used for both py2 and py3 --- pip/py3-nbconvert.file | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pip/py3-nbconvert.file b/pip/py3-nbconvert.file index cb5e702024c..19a7767c790 100644 --- a/pip/py3-nbconvert.file +++ b/pip/py3-nbconvert.file @@ -1,2 +1 @@ -Requires: py2-Jinja2 py2-Pygments py2-bleach py2-backports py2-defusedxml py2-entrypoints py2-mistune py2-pandocfilters py2-testpath py3-nbformat -%define RelocatePython %{i}/bin/jupyter-nbconvert +Requires: py3-nbformat From 11f8368cdc30088be2f2c761977f751634cea2fe Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Mon, 24 Aug 2020 23:05:01 +0200 Subject: [PATCH 6/9] only keep py3 deps here --- pip/py3-ipykernel.file | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip/py3-ipykernel.file b/pip/py3-ipykernel.file index 63ad6ff8c50..c725bbe00df 100644 --- a/pip/py3-ipykernel.file +++ b/pip/py3-ipykernel.file @@ -1 +1 @@ -Requires: py2-ipython py2-jedi py2-backcall py3-jupyter_client +Requires: py3-ipython py3-jupyter_client From 580b7e806230be5e0a87165be172a2b36a4519e3 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Mon, 24 Aug 2020 23:07:11 +0200 Subject: [PATCH 7/9] Update py3-matplotlib.file --- pip/py3-matplotlib.file | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip/py3-matplotlib.file b/pip/py3-matplotlib.file index f3179b58bb3..3fbf38f1189 100644 --- a/pip/py3-matplotlib.file +++ b/pip/py3-matplotlib.file @@ -1,4 +1,4 @@ -Requires: py3-numpy +Requires: py3-numpy py3-pillow %define PipPreBuild \ export CFLAGS="-I${FREETYPE_ROOT}/include/freetype2 -I${LIBPNG_ROOT}/include/libpng16" \ export LDFLAGS="-L${FREETYPE_ROOT}/lib -L${LIBPNG_ROOT}/lib" \ From 414f317f0c05dd8b7d15f6863a179e9f07ac8caf Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Mon, 24 Aug 2020 23:07:44 +0200 Subject: [PATCH 8/9] Update matplotlib.file --- pip/matplotlib.file | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pip/matplotlib.file b/pip/matplotlib.file index ee0c7143586..46c974655b6 100644 --- a/pip/matplotlib.file +++ b/pip/matplotlib.file @@ -1,3 +1,2 @@ -Requires: py2-cycler py2-kiwisolver py2-pyparsing py2-python-dateutil py2-certifi py3-pillow +Requires: py2-cycler py2-kiwisolver py2-pyparsing py2-python-dateutil py2-certifi Requires: zlib libpng freetype - From e128835c2808204305e1097017a56ea7b46d336d Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Tue, 25 Aug 2020 09:01:33 +0200 Subject: [PATCH 9/9] cleanup: nbconvert is still one package for py2/3 --- pip/nbconvert.file | 2 +- pip/py3-nbconvert.file | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 pip/py3-nbconvert.file diff --git a/pip/nbconvert.file b/pip/nbconvert.file index 566a97c91bd..31fb009ecf1 100644 --- a/pip/nbconvert.file +++ b/pip/nbconvert.file @@ -1,2 +1,2 @@ -Requires: py2-nbformat py2-Jinja2 py2-Pygments py2-bleach py2-backports py2-defusedxml py2-entrypoints py2-mistune py2-pandocfilters py2-testpath +Requires: py2-nbformat py2-Jinja2 py2-Pygments py2-bleach py2-backports py2-defusedxml py2-entrypoints py2-mistune py2-pandocfilters py2-testpath py3-nbformat %define RelocatePython %{i}/bin/jupyter-nbconvert diff --git a/pip/py3-nbconvert.file b/pip/py3-nbconvert.file deleted file mode 100644 index 19a7767c790..00000000000 --- a/pip/py3-nbconvert.file +++ /dev/null @@ -1 +0,0 @@ -Requires: py3-nbformat