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.
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
python3 pip package updates #6187
Merged
smuzaffar
merged 9 commits into
cms-sw:IB/CMSSW_11_2_X/master
from
davidlange6:dl200821
Aug 26, 2020
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
6e4ecc9
python3 pip package updates
davidlange6 a6c90e5
mixxed file
davidlange6 7d04c1f
move py3 execs out of the way
davidlange6 be24ae7
use py3*files for py3 requirements
davidlange6 a58750a
no need to dulicate the contents of nbconvert.file which are used for…
smuzaffar 11f8368
only keep py3 deps here
smuzaffar 580b7e8
Update py3-matplotlib.file
smuzaffar 414f317
Update matplotlib.file
smuzaffar e128835
cleanup: nbconvert is still one package for py2/3
smuzaffar File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Requires: py2-cffi py2-six py2-enum34 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,2 @@ | ||
Requires: py2-cycler py2-kiwisolver py2-pyparsing py2-python-dateutil | ||
Requires: py2-cycler py2-kiwisolver py2-pyparsing py2-python-dateutil py2-certifi | ||
Requires: zlib libpng freetype | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
Requires: py3-ipython | ||
Requires: py3-ipython py3-jupyter_client |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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?