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

bumping versions of python(2) tools #6108

Merged
merged 6 commits into from
Jul 30, 2020
+77 −102
Merged

bumping versions of python(2) tools #6108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
112e014
bumping versions of py2 tools
davidlange6 Jul 23, 2020
de1b24b
fix missing dependencies in pr, add additional updates
davidlange6 Jul 25, 2020
9e41133
revert keras change as it needs a bump in tensorflow version
davidlange6 Jul 26, 2020
832e6e5
fix version mismatches and bump numba/llvmlite to prod releases
davidlange6 Jul 27, 2020
d31f5a3
reverting to make python2 happy
davidlange6 Jul 27, 2020
e7ab238
removing patch
davidlange6 Jul 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pip/autopep8.file
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Requires: py2-pycodestyle
Requires: py2-pycodestyle py2-toml
%define RelocatePython %{i}/bin/*
2 changes: 1 addition & 1 deletion pip/flake8.file
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Requires: py2-backports py2-enum34 py2-mccabe py2-pycodestyle py2-pyflakes py2-entrypoints py2-functools32 py2-typing
Requires: py2-backports py2-enum34 py2-mccabe py2-pycodestyle py2-pyflakes py2-entrypoints py2-functools32 py2-typing py2-importlib-metadata
%define RelocatePython %{i}/bin/*
1 change: 1 addition & 0 deletions pip/mpld3.file
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Requires: py2-Jinja2 py2-matplotlib py3-matplotlib
3 changes: 0 additions & 3 deletions pip/py3-numba.file
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
Requires: py2-funcsigs py2-six py2-singledispatch py2-llvmlite py3-numpy python3
Patch0: py3-numba-llvm33

%define source0 git+https://github.com/numba/numba?obj=master/1ea770564cb3c0c6cb9d8ab92e7faf23cd4c4c19&export=numba-%{realversion}&output=/source.tar.gz
%define RelocatePython %{i}/bin/*
2 changes: 1 addition & 1 deletion pip/qtconsole.file
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Requires: py2-ipykernel py3-ipykernel
Requires: py2-ipykernel py3-ipykernel py2-QtPy
%define RelocatePython %{i}/bin/jupyter-qtconsole
138 changes: 71 additions & 67 deletions pip/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@
#############################################################################

absl-py==0.9.0
appdirs==1.4.3
appdirs==1.4.4
argparse==1.4.0
asn1crypto==1.3.0
astor==0.8.1
astroid==1.6.6 ; python_version<'3.0'
astroid==2.3.3 ; python_version>'3.0'
atomicwrites==1.3.0
atomicwrites==1.4.0
attrs==19.3.0
autopep8==1.5
avro==1.9.2
awkward==0.12.20
backcall==0.1.0
autopep8==1.5.3
avro==1.10.0
awkward==0.13.0
backcall==0.2.0
backports_abc==0.5
backports-functools_lru_cache==1.6.1
backports-lzma==0.0.14
Expand All @@ -36,35 +36,35 @@ backports-ssl_match_hostname==3.7.0.1
backports-weakref==1.0.post1
backports-os==0.1.1
beautifulsoup4==4.8.2
bleach==3.1.4
bleach==3.1.5
bokeh==1.4.0
Bottleneck==1.3.2
cachetools==3.1.1
certifi==2019.11.28
certifi==2020.6.20
cffi==1.14.0
chardet==3.0.4
Click==7.1.1
Click==7.1.2
#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
cloudpickle==1.3.0
colorama==0.4.3
configparser==4.0.2
contextlib2==0.6.0.post1
coverage==5.0.4
cryptography==2.8
coverage==5.2
cryptography==3.0
cx-Oracle==7.3.0
cycler==0.10.0
cython==0.29.15
cython==0.29.21
decorator==4.4.2
defusedxml==0.6.0
distlib==0.3.0
distlib==0.3.1
docopt==0.6.2
downhill==0.4.0
entrypoints==0.3
enum34==1.1.10;python_version<'3.0'
filelock==3.0.12
flake8==3.7.9
flake8==3.8.3
flawfinder==2.0.11
fs==2.4.11
funcsigs==1.0.2
Expand All @@ -78,34 +78,34 @@ GitPython==2.1.15 ; python_version<'3.0'
GitPython==3.1.0 ; python_version>'3.0'
google-common==0.0.1
google-pasta==0.2.0
grpcio==1.28.1
grpcio-tools==1.28.1
grpcio==1.30.0
grpcio-tools==1.30.0
h5py-cache==1.0
h5py==2.10.0
hep_ml==0.6.1
histbook==1.2.5
histogrammar==1.0.9 ; python_version<'3.0'
histogrammar==1.0.10 ; python_version>'3.0'
html5lib==1.0.1
html5lib==1.1
hyperas==0.4.1
hyperopt==0.2.3
idna==2.9
importlib-metadata==1.5.0
hyperopt==0.2.4
idna==2.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'
ipython_genutils==0.2.0
ipython==5.9.0 ; python_version<'3.0'
ipython==5.10.0 ; python_version<'3.0'
ipython==7.9.0 ; python_version>'3.0'
ipywidgets==7.5.1
isort==4.3.21
jedi==0.16.0
Jinja2==2.11.1
jedi==0.17.2
Jinja2==2.11.2
joblib==0.14.1
jsonpickle==1.3
jsonpickle==1.4.1
jsonschema==3.2.0
jupyter_client==5.3.4
jupyter_client==5.3.5
jupyter_console==5.2.0 ; python_version<'3.0'
jupyter_console==6.0.0 ; python_version>'3.0'
jupyter_core==4.6.3
Expand All @@ -114,13 +114,14 @@ Keras==2.3.1
keras-applications==1.0.8
keras-preprocessing==1.1.0
kiwisolver==1.1.0
#can not go to 1.5.x in python2 due to astroid
lazy-object-proxy==1.4.3
lizard==1.17.3
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.0dev
lxml==4.5.0
llvmlite==0.33.0
lxml==4.5.2
lz4==2.2.1
Mako==1.1.2
Mako==1.1.3
Markdown==3.1.1
MarkupSafe==1.1.1
matplotlib==2.2.5 ; python_version<'3.0'
Expand All @@ -130,7 +131,7 @@ mistune==0.8.4
mock==3.0.5
more-itertools==5.0.0 ; python_version<'3.0'
more-itertools==7.2.0 ; python_version>'3.0'
mpld3==0.3
mpld3==0.5.1
mpmath==1.1.0
nbconvert==5.6.1
nbdime==1.1.0
Expand All @@ -140,9 +141,9 @@ networkx==2.4 ; python_version>'3.0'
neurolab==0.3.5
nose-parameterized==0.6.0
nose==1.3.7
notebook==5.7.8 ; python_version<'3.0'
notebook==5.7.10 ; python_version<'3.0'
notebook==6.0.2 ; python_version>'3.0'
numba==0.50.0dev0 ; python_version>'3.0'
numba==0.50.1 ; python_version>'3.0'
Copy link
Contributor

Choose a reason for hiding this comment

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

@davidlange6 , numba 0.50.1 was not picked up due to hard coded commit in the https://github.com/cms-sw/cmsdist/blob/d31f5a3c35fca2d12b62afe01eb6441f6840b126/pip/py3-numba.file .

@mrodozov , please check if py3-numba-llvm33 patch is needed for numba 0.50.1?

Copy link
Contributor

Choose a reason for hiding this comment

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

I see this is done.
anyway, I'm checking out this whole thing to see how it goes with the additional awkward and uproot :/

numexpr==2.7.1
numpy==1.16.6 ; python_version<'3.0'
numpy==1.17.5 ; python_version>'3.0'
Expand All @@ -154,68 +155,69 @@ onnxruntime==1.2.0 ; python_version>'3.0'
opt-einsum==2.3.2 ; python_version<'3.0'
opt-einsum==3.1.0 ; python_version>'3.0'
ordereddict==1.1
packaging==20.3
packaging==20.4
pandas==0.24.2 ; python_version<'3.0'
pandas==0.25.3 ; python_version>'3.0'
pandocfilters==1.4.2
parsimonious==0.8.1
parso==0.5.2
parso==0.7.1
pathlib2==2.3.5
pbr==5.4.4
pbr==5.4.5
pexpect==4.8.0
pickleshare==0.7.5
pillow==6.2.2
pkgconfig==1.5.1
plac==1.1.3
plac==1.2.0
pluggy==0.13.1
ply==3.11
prettytable==0.7.2
prometheus_client==0.7.1
prometheus_client==0.8.0
prompt_toolkit==1.0.18 ; python_version<'3.0'
prompt_toolkit==2.0.10 ; python_version>'3.0'
protobuf==3.10.0
prwlock==0.4.0
psutil==5.7.0
prwlock==0.4.1
psutil==5.7.2
ptyprocess==0.6.0
pyasn1-modules==0.2.8
pyasn1==0.4.8
pybind11==2.4.3
pybrain==0.3.3
pycodestyle==2.5.0
pycodestyle==2.6.0
pycparser==2.20
pycuda==2019.1.2
pycurl==7.43.0.5
pydot==1.4.1
pyflakes==2.1.1
pyflakes==2.2.0
Pygments==2.5.2
pylint==1.9.5 ; python_version<'3.0'
pylint==2.4.3 ; python_version>'3.0'
pymongo==3.10.1
pyOpenSSL==19.1.0
pyparsing==2.4.6
pyrsistent==0.15.7
py==1.8.1
pyparsing==2.4.7
pyrsistent==0.16.0
py==1.9.0
pysqlite==2.8.3; python_version<'3.0'
pytest==4.6.9 ; python_version<'3.0'
pytest==4.6.11 ; python_version<'3.0'
pytest==5.2.2 ; python_version>'3.0'
pytest-cov==2.8.1
pytest-runner==5.2
python-cjson==1.2.2;python_version<'3.0'
python-dateutil==2.8.1
python-ldap==3.2.0
pytools==2020.1
pytz==2019.3
python-ldap==3.3.1
pytools==2020.3
pytz==2020.1
PyYAML==5.3.1
pyzmq==19.0.0
qtconsole==4.5.5
pyzmq==19.0.1
qtconsole==4.7.5
QtPy==1.9.0
repoze-lru==0.7
rep==0.6.6
requests==2.23.0
requests==2.24.0
root_numpy==4.8.0
root_pandas==0.7.0;python_version<'3.0'
rootpy==1.0.1;python_version<'3.0'
scandir==1.10.0
schema==0.7.1
schema==0.7.2
scikit-learn==0.20.4 ; python_version<'3.0'
scikit-learn==0.23.0 ; python_version>'3.0'
scipy==1.2.3 ; python_version<'3.0'
Expand All @@ -226,10 +228,10 @@ Send2Trash==1.5.0
setuptools-scm==3.5.0
simplegeneric==0.8.1
singledispatch==3.4.0.3
six==1.14.0
six==1.15.0
smmap==3.0.1
smmap2==3.0.1
soupsieve==1.9.5
soupsieve==1.9.6
sqlalchemy==1.3.11
stevedore==1.32.0
subprocess32==3.5.4
Expand All @@ -248,31 +250,33 @@ terminado==0.8.3
testpath==0.4.4
theanets==0.7.3
Theano==1.0.4
toml==0.10.1
tornado==5.1.1 ; python_version<'3.0'
tornado==6.0.3 ; python_version>'3.0'
tqdm==4.43.0
tqdm==4.48.0
traitlets==4.3.3
typed-ast==1.4.1 ; python_version>'3.0'
typing_extensions==3.7.4.1
typing==3.7.4.1
uncertainties==3.1.2
uproot==3.11.3
uproot-methods==0.7.3
urllib3==1.25.8
virtualenv-clone==0.5.3
virtualenv==20.0.13
typing_extensions==3.7.4.2
typing==3.7.4.3
uncertainties==3.1.4
uproot==3.12.0
uproot-methods==0.7.4
urllib3==1.25.10
virtualenv-clone==0.5.4
virtualenv==20.0.27
virtualenvwrapper==4.8.4
wcwidth==0.1.8
wcwidth==0.2.5
webencodings==0.5.1
Werkzeug==1.0.0
Werkzeug==1.0.1
wheel==0.33.6
widgetsnbextension==3.5.1
#cannot wrapt update before astroid is
wrapt==1.11.2
wrapt==1.11.2
xgboost==0.82 ; python_version<'3.0'
xgboost==0.90 ; python_version>'3.0'
#bumping this pulls in xrootd - which looks like it needs some understanding
xrootdpyfs==0.1.6
hepdata-lib==0.3.0;python_version<'3.0'
hepdata-lib==0.4.1;python_version<'3.0'
zipp==1.2.0 ; python_version<'3.0'
zipp==3.1.0 ; python_version>'3.0'

2 changes: 1 addition & 1 deletion pip/uncertainties.file
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Requires: py2-numpy py3-numpy
Requires: py2-numpy py3-numpy py2-future
1 change: 1 addition & 0 deletions pip/wcwidth.file
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Requires: py2-backports-functools_lru_cache
28 changes: 0 additions & 28 deletions py3-numba-llvm33.patch
View file
Open in desktop

This file was deleted.