From 43ffe3bd4a89ee9377fea170a9d9d26cb38cc3dd Mon Sep 17 00:00:00 2001 From: Raul Infante-Sainz Date: Fri, 5 Apr 2019 10:50:06 +0100 Subject: Python cython and pkgconfig packages added for h5py After trying to set the pipeline from scratch with no internet conection (but all tarballs already downladed), `h5py' Python package complained about not having access to download `pkgconfig'. After solving this dependency, it also complained about not having `cython'. With this commit, we add `pkgconfig' (Python) and `cython' to the pipeline in order to be able to install `h5py' properly. --- reproduce/config/pipeline/dependency-versions.mk | 2 ++ reproduce/src/make/dependencies-python.mk | 18 +++++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) (limited to 'reproduce') diff --git a/reproduce/config/pipeline/dependency-versions.mk b/reproduce/config/pipeline/dependency-versions.mk index 2e74a45..b4cb819 100644 --- a/reproduce/config/pipeline/dependency-versions.mk +++ b/reproduce/config/pipeline/dependency-versions.mk @@ -98,6 +98,7 @@ cffi-version = 1.12.2 chardet-version = 3.0.4 cryptography-version = 2.6.1 cycler-version = 0.10.0 +cython-version = 0.29.6 entrypoints-version = 0.3 h5py-version = 2.9.0 html5lib-version = 1.0.1 @@ -111,6 +112,7 @@ numpy-version = 1.16.2 pip-version = 19.0.2 pycparser-version = 2.19 pyparsing-version = 2.3.1 +pypkgconfig-version = 1.5.1 python-dateutil-version = 2.8.0 requests-version = 2.21.0 scipy-version = 1.2.1 diff --git a/reproduce/src/make/dependencies-python.mk b/reproduce/src/make/dependencies-python.mk index 6711d17..eb5189d 100644 --- a/reproduce/src/make/dependencies-python.mk +++ b/reproduce/src/make/dependencies-python.mk @@ -70,6 +70,7 @@ pytarballs = $(foreach t, asn1crypto-$(asn1crypto-version).tar.gz \ chardet-$(chardet-version).tar.gz \ cryptography-$(cryptography-version).tar.gz \ cycler-$(cycler-version).tar.gz \ + Cython-$(cython-version).tar.gz \ entrypoints-$(entrypoints-version).tar.gz \ h5py-$(h5py-version).tar.gz \ html5lib-$(html5lib-version).tar.gz \ @@ -81,6 +82,7 @@ pytarballs = $(foreach t, asn1crypto-$(asn1crypto-version).tar.gz \ matplotlib-$(matplotlib-version).tar.gz \ mpi4py-$(mpi4py-version).tar.gz \ numpy-$(numpy-version).zip \ + pkgconfig-$(pypkgconfig-version).tar.gz \ pip-$(pip-version).tar.gz \ pycparser-$(pycparser-version).tar.gz \ python-$(python-version).tar.gz \ @@ -150,6 +152,7 @@ $(pytarballs): $(tdir)/%: elif [ $$n = chardet ]; then h=fc/bb/a5768c230f9ddb03acc9ef3f0d4a3cf93462473795d18e9535498c8f929d elif [ $$n = cryptography ]; then h=07/ca/bc827c5e55918ad223d59d299fff92f3563476c3b00d0a9157d9c0217449 elif [ $$n = cycler ]; then h=c2/4b/137dea450d6e1e3d474e1d873cd1d4f7d3beed7e0dc973b06e8e10d32488 + elif [ $$n = Cython ]; then h=36/da/fcb979fc8cb486a67a013d6aefefbb95a3e19e67e49dff8a35e014046c5e elif [ $$n = entrypoints ]; then h=b4/ef/063484f1f9ba3081e920ec9972c96664e2edb9fdc3d8669b0e3b8fc0ad7c elif [ $$n = h5py ]; then h=43/27/a6e7dcb8ae20a4dbf3725321058923fec262b6f7835179d78ccc8d98deec elif [ $$n = html ]; then h=85/3e/cf449cf1b5004e87510b9368e7a5f1acd8831c2d6691edd3c62a0823f98f @@ -161,6 +164,7 @@ $(pytarballs): $(tdir)/%: elif [ $$n = mpi ]; then h=55/a2/c827b196070e161357b49287fa46d69f25641930fd5f854722319d431843 elif [ $$n = numpy ]; then h=cf/8d/6345b4f32b37945fedc1e027e83970005fc9c699068d2f566b82826515f2 elif [ $$n = pip ]; then h=4c/4d/88bc9413da11702cbbace3ccc51350ae099bb351febae8acc85fec34f9af + elif [ $$n = pkgconfig ]; then h=6e/a9/ff67ef67217dfdf2aca847685fe789f82b931a6957a3deac861297585db6 elif [ $$n = pycparser ]; then h=68/9e/49196946aee219aead1290e00d1e7fdeab8567783e83e1b9ab5585e6206a elif [ $$n = pyparsing ]; then h=b9/b8/6b32b3e84014148dcd60dd05795e35c2e7f4b72f918616c61fdce83d27fc elif [ $$n = dateutil ]; then h=ad/99/5b2e99737edeb28c71bcbec5b5dda19d0d9ef3ca3e92e3e925e7c0bb364c @@ -312,14 +316,19 @@ $(ipydir)/cycler: $(tdir)/cycler-$(cycler-version).tar.gz \ $(ipydir)/six $(call pybuild, tar xf, $<, cycler-$(cycler-version)) +$(ipydir)/cython: $(tdir)/Cython-$(cython-version).tar.gz + $(call pybuild, tar xf, $<, Cython-$(cython-version)) + $(ipydir)/entrypoints: $(tdir)/entrypoints-$(entrypoints-version).tar.gz \ $(ipydir)/setuptools $(call pybuild, tar xf, $<, entrypoints-$(entrypoints-version)) $(ipydir)/h5py: $(tdir)/h5py-$(h5py-version).tar.gz \ - $(ipydir)/setuptools \ - $(ilidir)/hdf5 - # $(ipydir)/mpi4py # AFTER its problem is fixed. + $(ilidir)/hdf5 \ + $(ipydir)/cython \ + $(ipydir)/pypkgconfig \ + $(ipydir)/setuptools + #$(ipydir)/mpi4py # AFTER its problem is fixed. #export HDF5_MPI=ON; # AFTER its problem is fixed. export HDF5_DIR=$(ildir); \ $(call pybuild, tar xf, $<, h5py-$(h5py-version)) @@ -386,6 +395,9 @@ $(ibdir)/pip3: $(tdir)/pip-$(pip-version).tar.gz \ $(ipydir)/setuptools $(call pybuild, tar xf, $<, pip-$(pip-version)) +$(ipydir)/pypkgconfig: $(tdir)/pkgconfig-$(pypkgconfig-version).tar.gz + $(call pybuild, tar xf, $<, pkgconfig-$(pypkgconfig-version)) + $(ipydir)/pycparser: $(tdir)/pycparser-$(pycparser-version).tar.gz \ $(ipydir)/setuptools $(call pybuild, tar xf, $<, pycparser-$(pycparser-version)) -- cgit v1.2.1