From 6cffffeadbd2acb408525a7cc65bfd744ef0d5bf Mon Sep 17 00:00:00 2001 From: Raul Infante-Sainz Date: Tue, 23 Apr 2019 20:27:44 +0100 Subject: Python package mpmath added into the template With this commit, we add `mpmath' Python package into the template. This package is a prerequisite of `sympy', a package to do symbolic mathematics. The motivation of adding this package is because it is a dependency of `sympy', which is more widely used into the Python science community. --- .file-metadata | Bin 6545 -> 6631 bytes reproduce/software/config/installation/TARGETS.mk | 2 +- reproduce/software/config/installation/versions.mk | 2 ++ reproduce/software/make/python.mk | 16 ++++++++++++++++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.file-metadata b/.file-metadata index 9c1320a..70f3520 100644 Binary files a/.file-metadata and b/.file-metadata differ diff --git a/reproduce/software/config/installation/TARGETS.mk b/reproduce/software/config/installation/TARGETS.mk index 4b1ff2e..5aee765 100644 --- a/reproduce/software/config/installation/TARGETS.mk +++ b/reproduce/software/config/installation/TARGETS.mk @@ -38,4 +38,4 @@ top-level-programs = gnuastro # Python libraries/modules. -top-level-python = astropy +top-level-python = astropy mpmath diff --git a/reproduce/software/config/installation/versions.mk b/reproduce/software/config/installation/versions.mk index cfa7f81..0d1010b 100644 --- a/reproduce/software/config/installation/versions.mk +++ b/reproduce/software/config/installation/versions.mk @@ -127,6 +127,7 @@ kiwisolver-version = 1.0.1 keyring-version = 18.0.0 matplotlib-version = 3.0.2 mpi4py-version = 3.0.1 +mpmath-version = 1.1.0 numpy-version = 1.16.2 pip-version = 19.0.2 pycparser-version = 2.19 @@ -140,6 +141,7 @@ setuptools-version = 40.8.0 setuptools_scm-version = 3.2.0 six-version = 1.12.0 soupsieve-version = 1.8 +sympy-version = 1.4 urllib3-version = 1.24.1 virtualenv-version = 16.4.0 webencodings-version = 0.5.1 diff --git a/reproduce/software/make/python.mk b/reproduce/software/make/python.mk index e856906..bdf5fe5 100644 --- a/reproduce/software/make/python.mk +++ b/reproduce/software/make/python.mk @@ -78,6 +78,7 @@ pytarballs = $(foreach t, asn1crypto-$(asn1crypto-version).tar.gz \ libffi-$(libffi-version).tar.gz \ matplotlib-$(matplotlib-version).tar.gz \ mpi4py-$(mpi4py-version).tar.gz \ + mpmath-$(mpmath-version).tar.gz \ numpy-$(numpy-version).zip \ pkgconfig-$(pypkgconfig-version).tar.gz \ pip-$(pip-version).tar.gz \ @@ -92,6 +93,7 @@ pytarballs = $(foreach t, asn1crypto-$(asn1crypto-version).tar.gz \ setuptools_scm-$(setuptools_scm-version).tar.gz \ six-$(six-version).tar.gz \ soupsieve-$(soupsieve-version).tar.gz \ + sympy-$(sympy-version).tar.gz \ urllib3-$(urllib3-version).tar.gz \ webencodings-$(webencodings-version).tar.gz \ virtualenv-$(virtualenv-version).tar.gz \ @@ -162,6 +164,7 @@ $(pytarballs): $(tdir)/%: elif [ $$n = kiwisolver ]; then h=31/60/494fcce70d60a598c32ee00e71542e52e27c978e5f8219fae0d4ac6e2864 elif [ $$n = matplotlib ]; then h=89/0c/653aec68e9cfb775c4fbae8f71011206e5e7fe4d60fcf01ea1a9d3bc957f elif [ $$n = mpi ]; then h=55/a2/c827b196070e161357b49287fa46d69f25641930fd5f854722319d431843 + elif [ $$n = mpmath ]; then h=ca/63/3384ebb3b51af9610086b23ea976e6d27d6d97bf140a76a365bd77a3eb32 elif [ $$n = numpy ]; then h=cf/8d/6345b4f32b37945fedc1e027e83970005fc9c699068d2f566b82826515f2 elif [ $$n = pip ]; then h=4c/4d/88bc9413da11702cbbace3ccc51350ae099bb351febae8acc85fec34f9af elif [ $$n = pkgconfig ]; then h=6e/a9/ff67ef67217dfdf2aca847685fe789f82b931a6957a3deac861297585db6 @@ -175,6 +178,7 @@ $(pytarballs): $(tdir)/%: elif [ $$n = setuptools_scm ]; then h=54/85/514ba3ca2a022bddd68819f187ae826986051d130ec5b972076e4f58a9f3 elif [ $$n = six ]; then h=dd/bf/4138e7bfb757de47d1f4b6994648ec67a51efe58fa907c1e11e350cddfca elif [ $$n = soupsieve ]; then h=0c/52/e9088bb9b96e2d39fc3b33fcda5b4fde9d71473536ac660a1ca9a0958a2f + elif [ $$n = sympy ]; then h=54/2e/6adb11fe599d4cfb7e8833753350ac51aa2c0603c226b36f9051cc9d2425 elif [ $$n = urllib ]; then h=b1/53/37d82ab391393565f2f831b8eedbffd57db5a718216f82f1a8b4d381a1c1 elif [ $$n = virtualenv ]; then h=51/aa/c395a6e6eaaedfa5a04723b6446a1df783b16cca6fec66e671cede514688 elif [ $$n = webencodings ]; then h=0b/02/ae6ceac1baeda530866a85075641cec12989bd8d31af6d5ab4a3e8c92f47 @@ -406,6 +410,11 @@ $(ipydir)/mpi4py: $(tdir)/mpi4py-$(mpi4py-version).tar.gz \ && cp $(dtexdir)/mpi4py.tex $(ictdir)/ \ && echo "mpi4py $(mpi4py-version) \citep{mpi4py2011}" > $@ +$(ipydir)/mpmath: $(tdir)/mpmath-$(mpmath-version).tar.gz \ + $(ipydir)/setuptools + $(call pybuild, tar xf, $<, mpmath-$(mpmath-version), ,\ + mpmath $(mpmath-version)) + $(ipydir)/numpy: $(tdir)/numpy-$(numpy-version).zip \ $(ipydir)/setuptools \ $(ibidir)/openblas \ @@ -495,6 +504,13 @@ $(ipydir)/soupsieve: $(tdir)/soupsieve-$(soupsieve-version).tar.gz \ $(call pybuild, tar xf, $<, soupsieve-$(soupsieve-version), ,\ SoupSieve $(soupsieve-version)) +$(ipydir)/sympy: $(tdir)/sympy-$(sympy-version).tar.gz \ + $(ipydir)/mpmath \ + $(ipydir)/setuptools + exit 1 + $(call pybuild, tar xf, $<, sympy-$(sympy-version), ,\ + SymPy $(sympy-version)) + $(ipydir)/urllib3: $(tdir)/urllib3-$(urllib3-version).tar.gz \ $(ipydir)/setuptools $(call pybuild, tar xf, $<, urllib3-$(urllib3-version), ,\ -- cgit v1.2.1