Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

python3 pip package updates #6187

Merged
merged 9 commits into from Aug 26, 2020
Merged

python3 pip package updates #6187

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6e4ecc9
python3 pip package updates
davidlange6 Aug 21, 2020
a6c90e5
mixxed file
davidlange6 Aug 22, 2020
7d04c1f
move py3 execs out of the way
davidlange6 Aug 24, 2020
be24ae7
use py3*files for py3 requirements
davidlange6 Aug 24, 2020
a58750a
no need to dulicate the contents of nbconvert.file which are used for…
smuzaffar Aug 24, 2020
11f8368
only keep py3 deps here
smuzaffar Aug 24, 2020
580b7e8
Update py3-matplotlib.file
smuzaffar Aug 24, 2020
414f317
Update matplotlib.file
smuzaffar Aug 24, 2020
e128835
cleanup: nbconvert is still one package for py2/3
smuzaffar Aug 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions pip/argon2-cffi.file
View file
Open in desktop
@@ -0,0 +1 @@
Requires: py2-cffi py2-six py2-enum34
2 changes: 1 addition & 1 deletion pip/ipykernel.file
View file
Open in desktop
@@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@davidlange6 , please add this in py3-ipykernel.file

1 change: 1 addition & 0 deletions pip/jupyter_client.file
View file
Open in desktop
@@ -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
2 changes: 1 addition & 1 deletion pip/matplotlib.file
View file
Open in desktop
@@ -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

2 changes: 1 addition & 1 deletion pip/nbconvert.file
View file
Open in desktop
@@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

better to create a new pip/py3-nbconvert.file file and add this py3 dependency there

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was not aware of that option.. Done. Any chance we can clean up the existing files to follow this pattern consistently?

%define RelocatePython %{i}/bin/jupyter-nbconvert
1 change: 1 addition & 0 deletions pip/nbformat.file
View file
Open in desktop
@@ -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
2 changes: 1 addition & 1 deletion pip/notebook.file
View file
Open in desktop
@@ -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
2 changes: 1 addition & 1 deletion pip/pandas.file
View file
Open in desktop
@@ -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
33 changes: 19 additions & 14 deletions pip/requirements.txt
View file
Open in desktop
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -95,20 +97,21 @@ 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
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
Expand All @@ -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
Expand All @@ -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'
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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'
Expand Down