From b3b44798a3f472e5f5a6633de4a582d4c902b008 Mon Sep 17 00:00:00 2001
From: Mohammad Akhlaghi <mohammad@akhlaghi.org>
Date: Thu, 18 Jun 2020 18:01:33 +0100
Subject: IMPORTANT: New software versions (17 basic, 16 high-level and 7
 Python)

It was a long time that the Maneage software versions hadn't been updated.

With this commit, the versions of all basic software were checked and 17 of
that had newer versions were updated. Also, 16 high-level programs and
libraries were updated as well as 7 Python modules. The full list is
available below.

Basic Software (affecting all projects)
---------------------------------------
bash            5.0.11 -> 5.0.18
binutils        2.32 -> 2.35
coreutils       8.31 -> 8.32
curl            7.65.3 -> 7.71.1
file            5.36 -> 5.39
gawk            5.0.1 -> 5.1.0
gcc             9.2.0 -> 10.2.0
gettext         0.20.2 -> 0.21
git             2.26.2 -> 2.28.0
gmp             6.1.2 -> 6.2.0
grep            3.3 -> 3.4
libbsd          0.9.1 -> 0.10.0
ncurses         6.1 -> 6.2
perl            5.30.0 -> 5.32.0
sed             4.7 -> 4.8
texinfo         6.6 -> 6.7
xz              5.2.4 -> 5.2.5

Custom programs/libraries
-------------------------
astrometrynet   0.77 -> 0.80
automake        0.16.1 -> 0.16.2
bison           3.6 -> 3.7
cfitsio         3.47 -> 3.48
cmake           3.17.0 -> 3.18.1
freetype        2.9 -> 2.10.2
gdb             8.3 -> 9.2
ghostscript     9.50 -> 9.52
gnuastro        0.11 -> 0.12
libgit2         0.28.2 -> 1.0.1
libidn          1.35 -> 1.36
openmpi         4.0.1 -> 4.0.4
R               3.6.2 -> 4.0.2
python          3.7.4 -> 3.8.5
wcslib          6.4 -> 7.3
yaml            0.2.2 -> 0.2.5

Python modules
--------------
cython          0.29.6 -> 0.29.21
h5py            2.9.0 -> 2.10.0
matplotlib      3.1.1 -> 3.3.0
mpi4py          3.0.2 -> 3.0.3
numpy           1.17.2 -> 1.19.1
pybind11        2.4.3 -> 2.5.0
scipy           1.3.1 -> 1.5.2
---
 reproduce/software/shell/configure.sh | 50 ++++-------------------------------
 1 file changed, 5 insertions(+), 45 deletions(-)

(limited to 'reproduce/software/shell')

diff --git a/reproduce/software/shell/configure.sh b/reproduce/software/shell/configure.sh
index b11992e..593b1d9 100755
--- a/reproduce/software/shell/configure.sh
+++ b/reproduce/software/shell/configure.sh
@@ -58,9 +58,6 @@ ptconf=$cdir/LOCAL_tmp.conf
 poconf=$cdir/LOCAL_old.conf
 depverfile=$cdir/versions.conf
 depshafile=$cdir/checksums.conf
-# --------- Delete for no Gnuastro ---------
-glconf=$adir/gnuastro/gnuastro-local.conf
-# ------------------------------------------
 
 
 
@@ -634,12 +631,10 @@ EOF
 # (for example the user might have ran `./project configure' by mistake).
 printnotice=yes
 rewritepconfig=yes
-rewritegconfig=yes
-if [ -f $pconf ] || [ -f $glconf ]; then
+if [ -f $pconf ]; then
     if [ $existing_conf = 1 ]; then
         printnotice=no
         if [ -f $pconf  ]; then rewritepconfig=no; fi
-        if [ -f $glconf ]; then rewritegconfig=no; fi
     fi
 fi
 
@@ -1010,44 +1005,6 @@ fi
 
 
 
-# --------- Delete for no Gnuastro ---------
-# Get the version of Gnuastro that must be used.
-gversion=$(awk '$1=="gnuastro-version" {print $NF}' $depverfile)
-
-# Gnuastro's local configuration settings
-if [ $rewritegconfig = yes ]; then
-    create_file_with_notice $glconf
-    echo "# Minimum number of bytes to use HDD/SSD instead of RAM." >> $glconf
-    echo " minmapsize $minmapsize"                                  >> $glconf
-    echo                                                            >> $glconf
-    echo "# Version of Gnuastro that must be used."                 >> $glconf
-    echo " onlyversion $gversion"                                   >> $glconf
-else
-    ingversion=$(awk '$1=="onlyversion" {print $NF}' $glconf)
-    if [ x$ingversion != x$gversion ]; then
-           cat <<EOF
-______________________________________________________
-!!!!!!!!!!!!!!!!!!CONFIGURATION ERROR!!!!!!!!!!!!!!!!!
-
-Gnuastro's version in '$glconf' ($ingversion) doesn't match the tarball
-version that this project was designed to use in '$depverfile'
-($gversion). Please re-run after removing the former file:
-
-   $ rm $glconf
-   $ ./project configure -e
-
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-EOF
-        exit 1
-    fi
-fi
-# ------------------------------------------
-
-
-
-
-
 # Delete final configuration target
 # ---------------------------------
 #
@@ -1148,12 +1105,15 @@ fi
 # Note: if we don't delete them first, it can happen that an extra link
 # will be created in each directory that points to its parent. So to be
 # safe, we are deleting all the links on each re-configure of the project.
-rm -f .build .local .gnuastro
+rm -f .build .local
+
 ln -s $bdir .build
 ln -s $instdir .local
 ln -s $texdir tex/build
 ln -s $tikzdir tex/tikz
+
 # --------- Delete for no Gnuastro ---------
+rm -f .gnuastro
 ln -s $topdir/reproduce/analysis/config/gnuastro .gnuastro
 # ------------------------------------------
 
-- 
cgit v1.2.1