From 69f94f1022ad5dd3142b2f93d76612e13e0b5820 Mon Sep 17 00:00:00 2001 From: Raul Infante-Sainz Date: Mon, 29 Apr 2019 09:08:50 +0100 Subject: Modified sip_tpv Python package prerequisites Until this commit, the prerequisites of `sip_tpv' were `mpmath' and `sympy'. However, the real prerequisites of `sip_tpv' are `astropy', `numpy' and `sympy'. With this commit, we fix this issue, and now `mpmath' is only a prerequisite of `sympy'. --- reproduce/software/make/python.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'reproduce/software/make/python.mk') diff --git a/reproduce/software/make/python.mk b/reproduce/software/make/python.mk index ba811ba..00e497b 100644 --- a/reproduce/software/make/python.mk +++ b/reproduce/software/make/python.mk @@ -497,7 +497,8 @@ $(ipydir)/setuptools_scm: $(tdir)/setuptools_scm-$(setuptools_scm-version).tar.g Setuptools-scm $(setuptools_scm-version)) $(ipydir)/sip_tpv: $(tdir)/sip_tpv-$(sip_tpv-version).tar.gz \ - $(ipydir)/mpmath \ + $(ipydir)/astropy \ + $(ipydir)/numpy \ $(ipydir)/sympy $(call pybuild, tar xf, $<, sip_tpv-$(sip_tpv-version), ,) \ && cp $(dtexdir)/sip_tpv.tex $(ictdir)/ \ -- cgit v1.2.1 From 1ab991de9ee1f911bd156c1b45084763a4936a27 Mon Sep 17 00:00:00 2001 From: Raul Infante-Sainz Date: Mon, 29 Apr 2019 11:39:44 +0100 Subject: Added numpy and six as prerequisites of h5py Until now, we were missing `numpy' and `six' as prerequisites of `h5py'. Because we did the configure step with all cores, `numpy' and `six' allways were built before `h5py' with any crash. However, in a single thread configure run we noticed that we were missing these two dependencies. With this commit, we fix this issue by setting `numpy' and `six' as prerequisites of `h5py'. --- reproduce/software/make/python.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'reproduce/software/make/python.mk') diff --git a/reproduce/software/make/python.mk b/reproduce/software/make/python.mk index 00e497b..558de56 100644 --- a/reproduce/software/make/python.mk +++ b/reproduce/software/make/python.mk @@ -347,10 +347,12 @@ $(ipydir)/entrypoints: $(tdir)/entrypoints-$(entrypoints-version).tar.gz \ EntryPoints $(entrypoints-version)) $(ipydir)/h5py: $(tdir)/h5py-$(h5py-version).tar.gz \ - $(ibidir)/hdf5 \ $(ipydir)/cython \ + $(ibidir)/hdf5 \ + $(ipydir)/numpy \ $(ipydir)/pypkgconfig \ - $(ipydir)/setuptools + $(ipydir)/setuptools \ + $(ipydir)/six #$(ipydir)/mpi4py # AFTER its problem is fixed. #export HDF5_MPI=ON; # AFTER its problem is fixed. export HDF5_DIR=$(ildir); \ -- cgit v1.2.1