Merge pull request #3111 from davidlange6/pythonUpdate170620

Python package updates
cms-sw · Jun 22, 2017 · 1f46154 · 1f46154
2 parents f03987e + 777b2ef
commit 1f46154
Show file tree

Hide file tree

Showing 50 changed files with 131 additions and 60 deletions.
diff --git a/cmssw-tool-conf.spec b/cmssw-tool-conf.spec
@@ -152,7 +152,7 @@ Requires: py2-pippkgs-toolfile
 Requires: py2-pippkgs_depscipy-toolfile
 Requires: dasgoclient
 Requires: OpenBLAS-toolfile
-Requires: py2-pip
+Requires: py2-pip-toolfile
 
 # Only for Linux platform.
 %if %islinux

diff --git a/py2-Jinja2.spec b/py2-Jinja2.spec
@@ -1,4 +1,4 @@
-### RPM external py2-Jinja2 2.9.5
+### RPM external py2-Jinja2 2.9.6
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 

diff --git a/py2-Keras.spec b/py2-Keras.spec
@@ -1,4 +1,4 @@
-### RPM external py2-Keras 1.2.2
+### RPM external py2-Keras 2.0.5
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 

diff --git a/py2-MarkupSafe.spec b/py2-MarkupSafe.spec
@@ -1,4 +1,4 @@
-### RPM external py2-MarkupSafe 0.23
+### RPM external py2-MarkupSafe 1.0
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 

diff --git a/py2-appdirs.spec b/py2-appdirs.spec
@@ -1,4 +1,4 @@
-### RPM external py2-appdirs 1.4.0
+### RPM external py2-appdirs 1.4.3
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 

diff --git a/py2-bleach.spec b/py2-bleach.spec
@@ -1,4 +1,4 @@
-### RPM external py2-bleach 1.5.0
+### RPM external py2-bleach 2.0.0
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 

diff --git a/py2-bottleneck.spec b/py2-bottleneck.spec
@@ -1,4 +1,4 @@
-### RPM external py2-bottleneck 1.2.0
+### RPM external py2-bottleneck 1.2.1
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 %define pip_name bottleneck

diff --git a/py2-certifi.spec b/py2-certifi.spec
@@ -1,4 +1,4 @@
-### RPM external py2-certifi 2017.1.23
+### RPM external py2-certifi 2017.4.17
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 

diff --git a/py2-chardet.spec b/py2-chardet.spec
@@ -0,0 +1,11 @@
+### RPM external py2-chardet 3.0.4
+## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
+
+
+%define pip_name chardet
+
+
+## IMPORT build-with-pip
+
+%define PipPostBuild \
+   perl -p -i -e "s|^#!.*python|#!/usr/bin/env python|" %{i}/bin/*
diff --git a/py2-cjson.spec b/py2-cjson.spec
@@ -1,4 +1,4 @@
-### RPM external py2-cjson 1.1.0
+### RPM external py2-cjson 1.2.1
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 

diff --git a/py2-climate.spec b/py2-climate.spec
@@ -0,0 +1,9 @@
+### RPM external py2-climate 0.4.6
+## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
+
+
+%define pip_name climate
+
+
+## IMPORT build-with-pip
+
diff --git a/py2-entrypoints.spec b/py2-entrypoints.spec
@@ -1,4 +1,4 @@
-### RPM external py2-entrypoints 0.2.2
+### RPM external py2-entrypoints 0.2.3
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 %define PipDownloadOptions --no-deps%%20--no-binary%%3D:none:

diff --git a/py2-futures.spec b/py2-futures.spec
@@ -1,4 +1,4 @@
-### RPM external py2-futures 3.0.5
+### RPM external py2-futures 3.1.1
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 

diff --git a/py2-idna.spec b/py2-idna.spec
@@ -0,0 +1,9 @@
+### RPM external py2-idna 2.5
+## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
+
+
+%define pip_name idna
+
+
+## IMPORT build-with-pip
+
diff --git a/py2-ipykernel.spec b/py2-ipykernel.spec
@@ -1,9 +1,9 @@
-### RPM external py2-ipykernel 4.5.2
+### RPM external py2-ipykernel 4.6.1
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 
 %define pip_name ipykernel
-Requires: py2-ordereddict py2-packaging py2-backports_abc py2-singledispatch py2-pyparsing py2-appdirs py2-pexpect py2-six py2-ptyprocess py2-traitlets py2-ipython_genutils py2-pyzmq py2-pathlib2 py2-tornado py2-jupyter_core py2-ipython py2-certifi py2-pickleshare py2-decorator py2-prompt_toolkit py2-jupyter_client py2-wcwidth py2-Pygments py2-setuptools py2-backportsssl_match_hostname py2-simplegeneric py2-scandir 
+Requires: py2-ordereddict py2-packaging py2-backports_abc py2-singledispatch py2-pyparsing py2-appdirs py2-pexpect py2-six py2-ptyprocess py2-traitlets py2-ipython_genutils py2-pyzmq py2-pathlib2 py2-tornado py2-jupyter_core py2-ipython py2-certifi py2-pickleshare py2-decorator py2-prompt_toolkit py2-jupyter_client py2-wcwidth py2-Pygments py2-setuptools py2-backportsssl_match_hostname py2-simplegeneric py2-scandir py2-enum34 py2-shutil_get_terminal_size py2-python-dateutil
 
 ## IMPORT build-with-pip
 
diff --git a/py2-ipython.spec b/py2-ipython.spec
@@ -1,4 +1,4 @@
-### RPM external py2-ipython 5.2.0
+### RPM external py2-ipython 5.3.0
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 

diff --git a/py2-ipython_genutils.spec b/py2-ipython_genutils.spec
@@ -1,4 +1,4 @@
-### RPM external py2-ipython_genutils 0.1.0
+### RPM external py2-ipython_genutils 0.2.0
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 

diff --git a/py2-jsonschema.spec b/py2-jsonschema.spec
@@ -1,4 +1,4 @@
-### RPM external py2-jsonschema 2.5.1
+### RPM external py2-jsonschema 2.6.0
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 

diff --git a/py2-jupyter_client.spec b/py2-jupyter_client.spec
@@ -1,4 +1,4 @@
-### RPM external py2-jupyter_client 4.4.0
+### RPM external py2-jupyter_client 5.0.1
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 
@@ -7,5 +7,5 @@ Requires: py2-jupyter_core py2-six py2-traitlets py2-decorator py2-ipython_genut
 
 ## IMPORT build-with-pip
 %define PipPostBuild \
-   perl -p -i -e "s|^#!.*python|#!/usr/bin/env python|" %{i}/bin/jupyter-kernelspec
+   perl -p -i -e "s|^#!.*python|#!/usr/bin/env python|" %{i}/bin/*
 
diff --git a/py2-jupyter_console.spec b/py2-jupyter_console.spec
@@ -1,4 +1,4 @@
-### RPM external py2-jupyter_console 5.0.0
+### RPM external py2-jupyter_console 5.1.0
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 

diff --git a/py2-jupyter_core.spec b/py2-jupyter_core.spec
@@ -1,4 +1,4 @@
-### RPM external py2-jupyter_core 4.2.1
+### RPM external py2-jupyter_core 4.3.0
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 

diff --git a/py2-mistune.spec b/py2-mistune.spec
@@ -1,4 +1,4 @@
-### RPM external py2-mistune 0.7.3
+### RPM external py2-mistune 0.7.4
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 

diff --git a/py2-nbconvert.spec b/py2-nbconvert.spec
@@ -1,4 +1,4 @@
-### RPM external py2-nbconvert 5.1.1
+### RPM external py2-nbconvert 5.2.1
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 

diff --git a/py2-nbformat.spec b/py2-nbformat.spec
@@ -1,4 +1,4 @@
-### RPM external py2-nbformat 4.2.0
+### RPM external py2-nbformat 4.3.0
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 

diff --git a/py2-numba.spec b/py2-numba.spec
@@ -1,4 +1,4 @@
-### RPM external py2-numba 0.32.0
+### RPM external py2-numba 0.33.0
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 

diff --git a/py2-pandas.spec b/py2-pandas.spec
@@ -1,4 +1,4 @@
-### RPM external py2-pandas 0.20.1
+### RPM external py2-pandas 0.20.2
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 %define pip_name pandas

diff --git a/py2-pathlib2.spec b/py2-pathlib2.spec
@@ -1,4 +1,4 @@
-### RPM external py2-pathlib2 2.2.1
+### RPM external py2-pathlib2 2.3.0
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 

diff --git a/py2-pbr.spec b/py2-pbr.spec
@@ -1,4 +1,4 @@
-### RPM external py2-pbr 1.10.0
+### RPM external py2-pbr 3.0.1
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 

diff --git a/py2-pip-toolfile.spec b/py2-pip-toolfile.spec
@@ -0,0 +1,24 @@
+### RPM external py2-pip-toolfile 1.0
+Requires: py2-pip
+%prep
+
+%build
+
+%install
+
+mkdir -p %{i}/etc/scram.d
+cat << \EOF_TOOLFILE >%{i}/etc/scram.d/py2-pip.xml
+<tool name="py2-pip" version="@TOOL_VERSION@">
+  <info url="https://pypi.python.org/pypi/pip"/>
+  <client>
+    <environment name="PY2_PIP" default="@TOOL_ROOT@"/>
+    <environment name="LIBDIR" default="$PY2_PIP/lib"/>
+    <runtime name="PYTHONPATH" value="$PY2_PIP/lib/python@PYTHONV@/site-packages" type="path"/>
+    <runtime name="PATH" value="$PY2_PIP/bin" type="path"/>
+  </client>
+</tool>
+EOF_TOOLFILE
+
+export PYTHONV=$(echo $PYTHON_VERSION | cut -f1,2 -d.)
+
+## IMPORT scram-tools-post
diff --git a/py2-pippkgs.spec b/py2-pippkgs.spec
@@ -84,6 +84,11 @@ BuildRequires: py2-click
 BuildRequires: py2-jsonpickle
 BuildRequires: py2-prwlock
 BuildRequires: py2-virtualenv
+BuildRequires: py2-climate
+BuildRequires: py2-urllib3
+BuildRequires: py2-chardet
+BuildRequires: py2-idna
+
 %prep
 
 %build

diff --git a/py2-prompt_toolkit.spec b/py2-prompt_toolkit.spec
@@ -1,4 +1,4 @@
-### RPM external py2-prompt_toolkit 1.0.10
+### RPM external py2-prompt_toolkit 1.0.14
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 

diff --git a/py2-psutil.spec b/py2-psutil.spec
@@ -1,4 +1,4 @@
-### RPM external py2-psutil 5.0.1
+### RPM external py2-psutil 5.2.2
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 

diff --git a/py2-pyparsing.spec b/py2-pyparsing.spec
@@ -1,4 +1,4 @@
-### RPM external py2-pyparsing 2.1.10
+### RPM external py2-pyparsing 2.2.0
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 

diff --git a/py2-python-dateutil.spec b/py2-python-dateutil.spec
@@ -1,4 +1,4 @@
-### RPM external py2-python-dateutil 1.5
+### RPM external py2-python-dateutil 2.6.0
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 ## IMPORT build-with-pip
diff --git a/py2-pytz.spec b/py2-pytz.spec
@@ -1,4 +1,4 @@
-### RPM external py2-pytz 2016.10
+### RPM external py2-pytz 2017.2
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 

diff --git a/py2-qtconsole.spec b/py2-qtconsole.spec
@@ -1,4 +1,4 @@
-### RPM external py2-qtconsole 4.2.1
+### RPM external py2-qtconsole 4.3.0
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 

diff --git a/py2-requests.spec b/py2-requests.spec
@@ -1,6 +1,7 @@
-### RPM external py2-requests 2.13.0
+### RPM external py2-requests 2.18.1
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
+Requires: py2-urllib3 py2-chardet py2-idna py2-certifi
 
 %define pip_name requests
 

diff --git a/py2-rootpy.spec b/py2-rootpy.spec
@@ -1,4 +1,4 @@
-### RPM external py2-rootpy 0.8.0
+### RPM external py2-rootpy 0.9.0
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 

diff --git a/py2-scandir.spec b/py2-scandir.spec
@@ -1,4 +1,4 @@
-### RPM external py2-scandir 1.4
+### RPM external py2-scandir 1.5
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 

diff --git a/py2-schema.spec b/py2-schema.spec
@@ -1,4 +1,4 @@
-### RPM external py2-schema 0.6.5
+### RPM external py2-schema 0.6.6
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 

diff --git a/py2-tables-fix-for-aarch64.patch b/py2-tables-fix-for-aarch64.patch
diff --git a/py2-tables-fix-for-aarch64_v2.patch b/py2-tables-fix-for-aarch64_v2.patch
@@ -0,0 +1,18 @@
+--- a/setup.py	2017-06-19 15:04:52.000000000 +0200
++++ b/setup.py	2017-06-19 15:05:52.000000000 +0200
+@@ -32,13 +32,8 @@
+ from setuptools.command.build_ext import build_ext
+
+ # For guessing the capabilities of the CPU for C-Blosc
+-try:
+-    import cpuinfo
+-    cpu_info = cpuinfo.get_cpu_info()
+-    cpu_flags = cpu_info['flags']
+-except Exception as e:
+-    print('cpuinfo failed, assuming no CPU features:', e)
+-    cpu_flags = []
++# avoid guessing for CMS
++cpu_flags = []
+
+ # The name for the pkg-config utility
+ PKG_CONFIG = 'pkg-config'
diff --git a/py2-tables.spec b/py2-tables.spec
@@ -1,6 +1,6 @@
-### RPM external py2-tables 3.3.0
+### RPM external py2-tables 3.4.2
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
-Patch0: py2-tables-fix-for-aarch64
+Patch0: py2-tables-fix-for-aarch64_v2
 %define pip_name tables
 Requires: py2-numexpr py2-six py2-numpy hdf5 bz2lib
 

diff --git a/py2-testpath.spec b/py2-testpath.spec
@@ -1,4 +1,4 @@
-### RPM external py2-testpath 0.3
+### RPM external py2-testpath 0.3.1
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 %define PipDownloadOptions --no-deps%%20--no-binary%%3D:none:

diff --git a/py2-theanets.spec b/py2-theanets.spec
@@ -2,7 +2,7 @@
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 %define pip_name theanets
-Requires: py2-numpy py2-Theano py2-downhill
+Requires: py2-numpy py2-Theano py2-downhill py2-climate
 
 ## IMPORT build-with-pip
 

diff --git a/py2-tqdm.spec b/py2-tqdm.spec
@@ -1,4 +1,4 @@
-### RPM external py2-tqdm 4.11.2
+### RPM external py2-tqdm 4.14.0
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 

diff --git a/py2-traitlets.spec b/py2-traitlets.spec
@@ -1,4 +1,4 @@
-### RPM external py2-traitlets 4.3.1
+### RPM external py2-traitlets 4.3.2
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 

diff --git a/py2-urllib3.spec b/py2-urllib3.spec
@@ -0,0 +1,9 @@
+### RPM external py2-urllib3 1.21.1
+## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
+
+
+%define pip_name urllib3
+
+
+## IMPORT build-with-pip
+
diff --git a/py2-webencodings.spec b/py2-webencodings.spec
@@ -1,4 +1,4 @@
-### RPM external py2-webencodings 0.5
+### RPM external py2-webencodings 0.5.1
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 

diff --git a/py2-xrootdpyfs.spec b/py2-xrootdpyfs.spec
@@ -1,4 +1,4 @@
-### RPM external py2-xrootdpyfs 0.1.3
+### RPM external py2-xrootdpyfs 0.1.4
 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 
 Requires: xrootd