From bc1011005dc58787fc26f9f091a9675fe88baeb7 Mon Sep 17 00:00:00 2001 From: Raul Infante-Sainz Date: Mon, 22 Apr 2019 14:12:00 +0100 Subject: Removed ATLAS as a prerequisite of Scamp Until this commit, ATLAS was a prerequisite of Scamp. The documentation says that. However, we have been able to install Scamp without having ATLAS installed. As a consecuence, ATLAS does not have to be a prerequisite of Scamp anymore. With this commit, we remove ATLAS as prerequisite of Scamp. We also put available software in the template as optional because not all people are going to use these software. --- .file-metadata | Bin 6365 -> 6365 bytes reproduce/software/make/high-level.mk | 16 ++++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.file-metadata b/.file-metadata index 35d6599..6deab7a 100644 Binary files a/.file-metadata and b/.file-metadata differ diff --git a/reproduce/software/make/high-level.mk b/reproduce/software/make/high-level.mk index 55ae090..cff2ff8 100644 --- a/reproduce/software/make/high-level.mk +++ b/reproduce/software/make/high-level.mk @@ -50,9 +50,18 @@ ipydir = $(BDIR)/software/installed/version-info/python # high level software depend on it. The current rule for ATLAS is tested # successfully on Mac (only static) and GNU/Linux (shared and static). But, # since it takes a few hours to build, it is not currently a target. -top-level-libraries = # atlas -top-level-programs = astrometrynet gnuastro metastore scamp sextractor swarp -top-level-python = astroquery matplotlib + +# About available software/libraries: currently the template has rules for +# installing software that are widely used in science, and in particular in +# astrophysics. However, not all of these software will be used for all +# people interested in this template. Due to that, we put some of what we +# consider the main software as optional software of the template (to see a +# complete list of all software/libraries, look at the version number +# Makefile). If that software is needed, just remove the comment `#' to +# install it. +top-level-libraries = # atlas +top-level-programs = gnuastro metastore # astrometrynet scamp sextractor swarp +top-level-python = numpy # astropy astroquery matplotlib scipy all: $(foreach p, $(top-level-libraries), $(ilidir)/$(p)) \ $(foreach p, $(top-level-programs), $(ibidir)/$(p)) \ $(foreach p, $(top-level-python), $(ipydir)/$(p)) \ @@ -740,7 +749,6 @@ $(ibidir)/netpbm: $(tdir)/netpbm-$(netpbm-version).tgz \ # the option --enable-openblas and it worked (same issue happened with # `sextractor'. $(ibidir)/scamp: $(tdir)/scamp-$(scamp-version).tar.lz \ - $(ilidir)/atlas \ $(ilidir)/fftw \ $(ilidir)/openblas \ $(ibidir)/cdsclient -- cgit v1.2.1