From b2ce38dc03977e682994950f10680dbc4e7a9ca5 Mon Sep 17 00:00:00 2001 From: David Date: Mon, 19 Jun 2017 15:33:31 +0200 Subject: [PATCH 1/7] update lots of python tools and add a pip toolfile --- cmssw-tool-conf.spec | 2 +- py2-Jinja2.spec | 2 +- py2-Keras.spec | 2 +- py2-MarkupSafe.spec | 2 +- py2-appdirs.spec | 2 +- py2-bleach.spec | 2 +- py2-bottleneck.spec | 2 +- py2-certifi.spec | 2 +- py2-cjson.spec | 2 +- py2-entrypoints.spec | 2 +- py2-futures.spec | 2 +- py2-ipykernel.spec | 4 ++-- py2-ipython.spec | 2 +- py2-ipython_genutils.spec | 2 +- py2-jsonschema.spec | 2 +- py2-jupyter_client.spec | 4 ++-- py2-jupyter_console.spec | 2 +- py2-jupyter_core.spec | 2 +- py2-mistune.spec | 2 +- py2-nbconvert.spec | 2 +- py2-nbformat.spec | 2 +- py2-numba.spec | 2 +- py2-pandas.spec | 2 +- py2-pathlib2.spec | 2 +- py2-pbr.spec | 2 +- py2-pip-toolfile.spec | 24 ++++++++++++++++++++++++ py2-prompt_toolkit.spec | 2 +- py2-psutil.spec | 2 +- py2-pyparsing.spec | 2 +- py2-python-dateutil.spec | 2 +- py2-pytz.spec | 2 +- py2-qtconsole.spec | 2 +- py2-requests.spec | 2 +- py2-rootpy.spec | 2 +- py2-scandir.spec | 2 +- py2-schema.spec | 2 +- py2-tables-fix-for-aarch64.patch | 15 --------------- py2-tables-fix-for-aarch64_v2.patch | 18 ++++++++++++++++++ py2-tables.spec | 4 ++-- py2-testpath.spec | 2 +- py2-tqdm.spec | 2 +- py2-traitlets.spec | 2 +- py2-webencodings.spec | 2 +- py2-xrootdpyfs.spec | 2 +- 44 files changed, 86 insertions(+), 59 deletions(-) create mode 100644 py2-pip-toolfile.spec delete mode 100644 py2-tables-fix-for-aarch64.patch create mode 100644 py2-tables-fix-for-aarch64_v2.patch diff --git a/cmssw-tool-conf.spec b/cmssw-tool-conf.spec index 0fdc0519557..77a80a45c38 100644 --- 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 index d99c271ac31..79300455a1b 100644 --- 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 index cc1e265a9b7..e5fc1b89720 100644 --- 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 index ffc4cbca6a4..9f6ba0e6ae0 100644 --- 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 index 291712d7898..be3a6c4d26e 100644 --- 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 index 3c967839130..c4b2b07bd24 100644 --- 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 index 998bffa9d2d..f399e2e4a66 100644 --- 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 index e8567fb6233..a08db9e98b0 100644 --- 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-cjson.spec b/py2-cjson.spec index 2c89bb58559..8216950c3ab 100644 --- 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-entrypoints.spec b/py2-entrypoints.spec index 9e44f8585c7..e4f14e09e95 100644 --- 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 index 2a931208334..554dc8db90c 100644 --- 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-ipykernel.spec b/py2-ipykernel.spec index 9673fe6adeb..7c33ef797e7 100644 --- 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 index 973f31e6185..1d180dfd99b 100644 --- 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 index c8590b77df3..5ca3ae55b15 100644 --- 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 index a704a251636..12cfdc5ee5a 100644 --- 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 index 4b22fdab11d..cf4f3cde968 100644 --- 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 index 63c42adeea9..344421e8ea2 100644 --- 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 index 884624bd219..102a96e576d 100644 --- 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 index 130dbb31a29..88894d306b9 100644 --- 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 index 71715812352..1f8c110ba44 100644 --- 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 index 0093c73466c..800e42bf4d5 100644 --- 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 index 493fdd20225..8e1d0b970a2 100644 --- 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 index 16a2cd62fab..29a71fc4f92 100644 --- 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 index 55f7bf9c440..8422073f3b0 100644 --- 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 index 37fdfccaf26..292c76f3e62 100644 --- 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 new file mode 100644 index 00000000000..30d75496eb1 --- /dev/null +++ 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 + + + + + + + +EOF_TOOLFILE + +export PYTHONV=$(echo $PYTHON_VERSION | cut -f1,2 -d.) + +## IMPORT scram-tools-post diff --git a/py2-prompt_toolkit.spec b/py2-prompt_toolkit.spec index 39bc2cc4835..d73912e32fa 100644 --- 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 index 7ab11556efb..10d64b0e2b9 100644 --- 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 index 8289733c3ef..866f8d95296 100644 --- 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 index 56671492448..7c84a7fc4c0 100644 --- 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 index 8830b08dcdb..33e4b215b76 100644 --- 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 index b226e6188bd..c595f7c5ed6 100644 --- 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 index ab22ac9c5e5..4ce61b2d175 100644 --- a/py2-requests.spec +++ b/py2-requests.spec @@ -1,4 +1,4 @@ -### RPM external py2-requests 2.13.0 +### RPM external py2-requests 2.18.1 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} diff --git a/py2-rootpy.spec b/py2-rootpy.spec index edf07102107..20e43f98781 100644 --- 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 index 379a936e418..ada7f388e87 100644 --- 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 index 29880155a6f..29c0083480e 100644 --- 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 deleted file mode 100644 index 6dfb8bb4da1..00000000000 --- a/py2-tables-fix-for-aarch64.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/setup.py b/setup.py -index 6b64a57..4681b14 100755 ---- a/setup.py -+++ b/setup.py -@@ -32,8 +32,8 @@ import distutils.spawn - from setuptools.command.build_ext import build_ext - - # For guessing the capabilities of the CPU for C-Blosc --import cpuinfo --cpu_info = cpuinfo.get_cpu_info() -+#import cpuinfo -+cpu_info = { 'flags' : [] } #to avoid compiling avx2 and make it run for aarch64 - - # The name for the pkg-config utility - PKG_CONFIG = 'pkg-config' diff --git a/py2-tables-fix-for-aarch64_v2.patch b/py2-tables-fix-for-aarch64_v2.patch new file mode 100644 index 00000000000..a7cbe434adb --- /dev/null +++ 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 index 4097f33ad38..ffa3f578f41 100644 --- 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 index 57bce6e3e8d..7718c170260 100644 --- 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-tqdm.spec b/py2-tqdm.spec index 072fe946f9d..815205004fe 100644 --- 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 index 7dcd15a4518..c830a724796 100644 --- 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-webencodings.spec b/py2-webencodings.spec index 7b4b22df51d..c91249507d9 100644 --- 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 index be7a8ab447e..9c60096d82a 100644 --- 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 From e9ceebdff552e29340365c2202c0b5f6c83aae62 Mon Sep 17 00:00:00 2001 From: David Date: Mon, 19 Jun 2017 15:45:28 +0200 Subject: [PATCH 2/7] fix missing end quote --- py2-pip-toolfile.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/py2-pip-toolfile.spec b/py2-pip-toolfile.spec index 30d75496eb1..f1efaa916d2 100644 --- a/py2-pip-toolfile.spec +++ b/py2-pip-toolfile.spec @@ -9,7 +9,7 @@ Requires: py2-pip mkdir -p %{i}/etc/scram.d cat << \EOF_TOOLFILE >%{i}/etc/scram.d/py2-pip.xml - From 5bf5cef1e5688edb59ff54695d8fadb890f5c75d Mon Sep 17 00:00:00 2001 From: David Date: Tue, 20 Jun 2017 14:41:16 +0200 Subject: [PATCH 3/7] add climate package which theanets depends on --- py2-climate.spec | 9 +++++++++ py2-pippkgs.spec | 1 + py2-theanets.spec | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 py2-climate.spec diff --git a/py2-climate.spec b/py2-climate.spec new file mode 100644 index 00000000000..a4ec6371865 --- /dev/null +++ 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-pippkgs.spec b/py2-pippkgs.spec index 1f173b2ce3f..bafb88a3f8e 100644 --- a/py2-pippkgs.spec +++ b/py2-pippkgs.spec @@ -84,6 +84,7 @@ BuildRequires: py2-click BuildRequires: py2-jsonpickle BuildRequires: py2-prwlock BuildRequires: py2-virtualenv +BuildRequires: py2-climate %prep %build diff --git a/py2-theanets.spec b/py2-theanets.spec index ed2d655b604..f2718296d12 100644 --- 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 From 21648553c652ecfe01e192fa4bb41cc5c7c0326f Mon Sep 17 00:00:00 2001 From: David Date: Tue, 20 Jun 2017 14:48:57 +0200 Subject: [PATCH 4/7] add urllib3 --- py2-pippkgs.spec | 2 ++ py2-requests.spec | 1 + py2-urllib3.spec | 9 +++++++++ 3 files changed, 12 insertions(+) create mode 100644 py2-urllib3.spec diff --git a/py2-pippkgs.spec b/py2-pippkgs.spec index bafb88a3f8e..ce2f5c467db 100644 --- a/py2-pippkgs.spec +++ b/py2-pippkgs.spec @@ -85,6 +85,8 @@ BuildRequires: py2-jsonpickle BuildRequires: py2-prwlock BuildRequires: py2-virtualenv BuildRequires: py2-climate +BuildRequires: py2-urllib3 + %prep %build diff --git a/py2-requests.spec b/py2-requests.spec index 4ce61b2d175..41fa27c775f 100644 --- a/py2-requests.spec +++ b/py2-requests.spec @@ -1,6 +1,7 @@ ### RPM external py2-requests 2.18.1 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} +Requires: py2-urllib3 %define pip_name requests diff --git a/py2-urllib3.spec b/py2-urllib3.spec new file mode 100644 index 00000000000..cda0be234f7 --- /dev/null +++ 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 + From deb18f5c681cb06a21ec06819af64306caf00a1c Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Tue, 20 Jun 2017 15:49:02 +0200 Subject: [PATCH 5/7] py2-pip-toolfile.spec: added missing / in scram toolfile --- py2-pip-toolfile.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/py2-pip-toolfile.spec b/py2-pip-toolfile.spec index f1efaa916d2..7283c329dc9 100644 --- a/py2-pip-toolfile.spec +++ b/py2-pip-toolfile.spec @@ -9,7 +9,7 @@ Requires: py2-pip mkdir -p %{i}/etc/scram.d cat << \EOF_TOOLFILE >%{i}/etc/scram.d/py2-pip.xml - + From 5e3ec94bf7ee80e4b74090fb489f578b8a62c00e Mon Sep 17 00:00:00 2001 From: David Date: Wed, 21 Jun 2017 14:10:38 +0200 Subject: [PATCH 6/7] picking up packages now split out from requests package --- py2-chardet.spec | 11 +++++++++++ py2-idna.spec | 9 +++++++++ py2-requests.spec | 2 +- 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 py2-chardet.spec create mode 100644 py2-idna.spec diff --git a/py2-chardet.spec b/py2-chardet.spec new file mode 100644 index 00000000000..96ec02e84a5 --- /dev/null +++ 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-idna.spec b/py2-idna.spec new file mode 100644 index 00000000000..33342f6772e --- /dev/null +++ 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-requests.spec b/py2-requests.spec index 41fa27c775f..b3a2c28bb9b 100644 --- a/py2-requests.spec +++ b/py2-requests.spec @@ -1,7 +1,7 @@ ### RPM external py2-requests 2.18.1 ## INITENV +PATH PYTHONPATH %{i}/${PYTHON_LIB_SITE_PACKAGES} -Requires: py2-urllib3 +Requires: py2-urllib3 py2-chardet py2-idna py2-certifi %define pip_name requests From 777b2ef4908173d6c43c798bce8d3cb5b0d53742 Mon Sep 17 00:00:00 2001 From: David Date: Wed, 21 Jun 2017 14:25:56 +0200 Subject: [PATCH 7/7] adding new tools --- py2-pippkgs.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/py2-pippkgs.spec b/py2-pippkgs.spec index ce2f5c467db..3bc147541b1 100644 --- a/py2-pippkgs.spec +++ b/py2-pippkgs.spec @@ -86,6 +86,8 @@ BuildRequires: py2-prwlock BuildRequires: py2-virtualenv BuildRequires: py2-climate BuildRequires: py2-urllib3 +BuildRequires: py2-chardet +BuildRequires: py2-idna %prep